Skip to content

refact: remove namespaces in favor of modules #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import tseslint from "typescript-eslint";

export default [
{ files: ["**/*.{js,mjs,cjs,ts}"] },
{ ignores: ["**/dist/", "src/declarations/", "test/projects/"] },
{ ignores: ["**/dist/", "src/declarations/", "test/projects/", "types/"] },
{ languageOptions: { globals: globals.node } },
pluginJs.configs.recommended,
...tseslint.configs.recommended,
Expand All @@ -13,7 +13,7 @@ export default [
"@typescript-eslint/ban-ts-comment": "warn",
"@typescript-eslint/no-empty-object-type": "warn",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-namespace": "warn",
"@typescript-eslint/no-namespace": ["error", { allowDeclarations: true }],
"@typescript-eslint/no-require-imports": "off",
"@typescript-eslint/no-unsafe-function-type": "warn",
"@typescript-eslint/no-unused-vars": "warn",
Expand Down
164 changes: 80 additions & 84 deletions src/harmony/versions/four-seven.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,104 +21,100 @@ import { DownSampleTsTypes } from "../utils";
// region: Mapping
/* ****************************************************************************************************************** */

export namespace TsFourSeven {
export type TypeMap = [
[TsCurrentModule.ImportDeclaration, TsFourSevenModule.ImportDeclaration],
[TsCurrentModule.Modifier, TsFourSevenModule.Modifier],
[TsCurrentModule.ImportClause, TsFourSevenModule.ImportClause],
[TsCurrentModule.Expression, TsFourSevenModule.Expression],
[TsCurrentModule.AssertClause, TsFourSevenModule.AssertClause],
[TsCurrentModule.ExportDeclaration, TsFourSevenModule.ExportDeclaration],
[TsCurrentModule.NamedExportBindings, TsFourSevenModule.NamedExportBindings],
[TsCurrentModule.ModuleDeclaration, TsFourSevenModule.ModuleDeclaration],
[TsCurrentModule.ModuleName, TsFourSevenModule.ModuleName],
[TsCurrentModule.ModuleBody, TsFourSevenModule.ModuleBody],
];
}
export type TypeMap = [
[TsCurrentModule.ImportDeclaration, TsFourSevenModule.ImportDeclaration],
[TsCurrentModule.Modifier, TsFourSevenModule.Modifier],
[TsCurrentModule.ImportClause, TsFourSevenModule.ImportClause],
[TsCurrentModule.Expression, TsFourSevenModule.Expression],
[TsCurrentModule.AssertClause, TsFourSevenModule.AssertClause],
[TsCurrentModule.ExportDeclaration, TsFourSevenModule.ExportDeclaration],
[TsCurrentModule.NamedExportBindings, TsFourSevenModule.NamedExportBindings],
[TsCurrentModule.ModuleDeclaration, TsFourSevenModule.ModuleDeclaration],
[TsCurrentModule.ModuleName, TsFourSevenModule.ModuleName],
[TsCurrentModule.ModuleBody, TsFourSevenModule.ModuleBody],
];

// endregion

/* ****************************************************************************************************************** */
// region: Utils
/* ****************************************************************************************************************** */

export namespace TsFourSeven {
export const predicate = ({ tsVersionMajor, tsVersionMinor }: TsTransformPathsContext) =>
tsVersionMajor == 4 && tsVersionMinor < 8;
export const predicate = ({ tsVersionMajor, tsVersionMinor }: TsTransformPathsContext) =>
tsVersionMajor == 4 && tsVersionMinor < 8;

export function handler(context: TsTransformPathsContext, prop: string | symbol) {
const factory = context.tsFactory as unknown as TsFourSevenModule.NodeFactory;
export function handler(context: TsTransformPathsContext, prop: string | symbol) {
const factory = context.tsFactory as unknown as TsFourSevenModule.NodeFactory;

switch (prop) {
case "updateImportDeclaration":
return function (
node: ImportDeclaration,
modifiers: readonly Modifier[] | undefined,
importClause: ImportClause | undefined,
moduleSpecifier: Expression,
assertClause: AssertClause | undefined,
) {
const [dsNode, dsImportClause, dsModuleSpecifier, dsAssertClause] = downSample(
node,
importClause,
moduleSpecifier,
assertClause,
);
switch (prop) {
case "updateImportDeclaration":
return function (
node: ImportDeclaration,
modifiers: readonly Modifier[] | undefined,
importClause: ImportClause | undefined,
moduleSpecifier: Expression,
assertClause: AssertClause | undefined,
) {
const [dsNode, dsImportClause, dsModuleSpecifier, dsAssertClause] = downSample(
node,
importClause,
moduleSpecifier,
assertClause,
);

return factory.updateImportDeclaration(
dsNode,
dsNode.decorators,
dsNode.modifiers,
dsImportClause,
dsModuleSpecifier,
dsAssertClause,
);
};
case "updateExportDeclaration":
return function (
node: ExportDeclaration,
modifiers: readonly Modifier[] | undefined,
isTypeOnly: boolean,
exportClause: NamedExportBindings | undefined,
moduleSpecifier: Expression | undefined,
assertClause: AssertClause | undefined,
) {
const [dsNode, dsExportClause, dsModuleSpecifier, dsAssertClause] = downSample(
node,
exportClause,
moduleSpecifier,
assertClause,
);
return factory.updateImportDeclaration(
dsNode,
dsNode.decorators,
dsNode.modifiers,
dsImportClause,
dsModuleSpecifier,
dsAssertClause,
);
};
case "updateExportDeclaration":
return function (
node: ExportDeclaration,
modifiers: readonly Modifier[] | undefined,
isTypeOnly: boolean,
exportClause: NamedExportBindings | undefined,
moduleSpecifier: Expression | undefined,
assertClause: AssertClause | undefined,
) {
const [dsNode, dsExportClause, dsModuleSpecifier, dsAssertClause] = downSample(
node,
exportClause,
moduleSpecifier,
assertClause,
);

return factory.updateExportDeclaration(
dsNode,
dsNode.decorators,
dsNode.modifiers,
isTypeOnly,
dsExportClause,
dsModuleSpecifier,
dsAssertClause,
);
};
case "updateModuleDeclaration":
return function (
node: ModuleDeclaration,
modifiers: readonly Modifier[] | undefined,
name: ModuleName,
body: ModuleBody | undefined,
) {
const [dsNode, dsName, dsBody] = downSample(node, name, body);
return factory.updateExportDeclaration(
dsNode,
dsNode.decorators,
dsNode.modifiers,
isTypeOnly,
dsExportClause,
dsModuleSpecifier,
dsAssertClause,
);
};
case "updateModuleDeclaration":
return function (
node: ModuleDeclaration,
modifiers: readonly Modifier[] | undefined,
name: ModuleName,
body: ModuleBody | undefined,
) {
const [dsNode, dsName, dsBody] = downSample(node, name, body);

return factory.updateModuleDeclaration(dsNode, dsNode.decorators, dsNode.modifiers, dsName, dsBody);
};
default:
return (...args: any) => (<any>factory)[prop](...args);
}
return factory.updateModuleDeclaration(dsNode, dsNode.decorators, dsNode.modifiers, dsName, dsBody);
};
default:
return (...args: any) => (<any>factory)[prop](...args);
}
}

export function downSample<T extends [...unknown[]]>(...args: T): DownSampleTsTypes<TypeMap, T> {
return <any>args;
}
export function downSample<T extends [...unknown[]]>(...args: T): DownSampleTsTypes<TypeMap, T> {
return <any>args;
}

// endregion
4 changes: 2 additions & 2 deletions src/harmony/versions/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from "./three-eight";
export * from "./four-seven";
export * as TsThreeEight from "./three-eight";
export * as TsFourSeven from "./four-seven";
Loading
Loading