@cmmn/tools 1.4.1 → 1.4.2

package/gen/gen.js

@@ -1,27 +1,27 @@
-import fs from "fs";
-import path from "path";
-import {fileURLToPath} from 'url';
-import {execSync} from "child_process";
-
-const currentDir = '__dirname' in global ? __dirname : path.dirname(fileURLToPath(import.meta.url));
-
-const templateTpl = fs.readFileSync(path.join(currentDir, './template.ts.tpl'), 'utf8');
-const componentTpl = fs.readFileSync(path.join(currentDir, './component.ts.tpl'), 'utf8');
-const styleTpl = fs.readFileSync(path.join(currentDir, './style.less.tpl'), 'utf8');
-
-
-export function gen(name, directory, nested = false) {
-    const Name = name.replace(/^./, c => c.toUpperCase());
-    name = Name.replace(/[A-Z]/g, (c, i) => (i ? '-' : '') + c.toLowerCase());
-    process.chdir(directory);
-    if (nested) {
-        fs.mkdirSync(name);
-        process.chdir(name);
-    }
-    fs.writeFileSync(name + '.component.ts', componentTpl.replace(/\$Name\$/g, Name).replace(/\$name\$/g, name), 'utf8');
-    fs.writeFileSync(name + '.template.ts', templateTpl.replace(/\$Name\$/g, Name).replace(/\$name\$/g, name), 'utf8');
-    fs.writeFileSync(name + '.style.less', styleTpl.replace(/\$Name\$/g, Name).replace(/\$name\$/g, name), 'utf8');
-    execSync(`git add ${name}.component.ts`);
-    execSync(`git add ${name}.template.ts`);
-    execSync(`git add ${name}.style.less`);
-}
+import fs from "fs";
+import path from "path";
+import {fileURLToPath} from 'url';
+import {execSync} from "child_process";
+
+const currentDir = '__dirname' in global ? __dirname : path.dirname(fileURLToPath(import.meta.url));
+
+const templateTpl = fs.readFileSync(path.join(currentDir, './template.ts.tpl'), 'utf8');
+const componentTpl = fs.readFileSync(path.join(currentDir, './component.ts.tpl'), 'utf8');
+const styleTpl = fs.readFileSync(path.join(currentDir, './style.less.tpl'), 'utf8');
+
+
+export function gen(name, directory, nested = false) {
+    const Name = name.replace(/^./, c => c.toUpperCase());
+    name = Name.replace(/[A-Z]/g, (c, i) => (i ? '-' : '') + c.toLowerCase());
+    process.chdir(directory);
+    if (nested) {
+        fs.mkdirSync(name);
+        process.chdir(name);
+    }
+    fs.writeFileSync(name + '.component.ts', componentTpl.replace(/\$Name\$/g, Name).replace(/\$name\$/g, name), 'utf8');
+    fs.writeFileSync(name + '.template.ts', templateTpl.replace(/\$Name\$/g, Name).replace(/\$name\$/g, name), 'utf8');
+    fs.writeFileSync(name + '.style.less', styleTpl.replace(/\$Name\$/g, Name).replace(/\$name\$/g, name), 'utf8');
+    execSync(`git add ${name}.component.ts`);
+    execSync(`git add ${name}.template.ts`);
+    execSync(`git add ${name}.style.less`);
+}

package/gen/style.less.tpl

@@ -1,3 +1,3 @@
-$name$ {
-    display: block;
-}
+$name$ {
+    display: block;
+}

package/gen/template.ts.tpl

@@ -1,8 +1,8 @@
-import {ITemplate} from "@cmmn/ui";
-
-export const template: ITemplate<IState, IEvents> = (html, state, events) => html`
-`;
-
-export type IState = {}
-
-export type IEvents = {}
+import {ITemplate} from "@cmmn/ui";
+
+export const template: ITemplate<IState, IEvents> = (html, state, events) => html`
+`;
+
+export type IState = {}
+
+export type IEvents = {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -60,10 +60,10 @@
     "rollup-plugin-visualizer": "^5.5.4",
     "ts-jest": "27.x.x",
     "ttypescript": "1.5.13",
-    "typescript": "4.4.3",
+    "typescript": "4.x.x",
     "typescript-transform-paths": "^3.3.1"
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "d1405a0626569d43adc867fe660f4df8b5c3b492"
+  "gitHead": "824d290afabaa3a44ccb98322cb1758825bd9efb"
 }

package/plugins/absolute-plugin.cjs

@@ -1,96 +1,96 @@
-const ts = require("typescript");
-const path = require("path");
-const fs = require("fs");
-
-function visitExportNode(exportNode, sourceFile) {
-    if (exportNode.typeOnly){
-        console.log('type olnly')
-        return ;
-    }
-    const file = exportNode.moduleSpecifier?.text ?? exportNode.test;
-    if (!file)
-        return;
-    const sourceFileDir = path.dirname(sourceFile.path);
-    const abs = path.resolve(sourceFileDir, file);
-    if (/\.(less|css|scss|sass|svg|png|html)$/.test(file)) {
-        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
-        const relFile = path.relative(absSource, abs)
-        return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(relFile), exportNode.typeOnly);
-    }
-    if (fs.existsSync(abs + '.ts')) {
-        return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(file + '.js'), exportNode.typeOnly);
-    }
-    if (fs.existsSync(abs + '/')) {
-        const indexFile = `${file}/index.js`;
-        return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(indexFile), exportNode.typeOnly);
-    }
-}
-
-function visitImportNode(importNode, sourceFile, options) {
-    const file = importNode.moduleSpecifier?.text;
-    if (!file)
-        return;
-    const sourceFileDir = path.dirname(sourceFile.path);
-    const abs = path.resolve(sourceFileDir, file);
-    if (/\.(less|css|scss|sass|svg|png|html)$/.test(file)) {
-        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
-        const relFile = path.relative(absSource, abs)
-        return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(relFile));
-    }
-    if (fs.existsSync(abs + '.ts')) {
-        return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(file + '.js'));
-    }
-    if (fs.existsSync(abs + '/')) {
-        const indexFile = `${file}/index.js`;
-        return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(indexFile));
-    }
-}
-
-function visitRequireNode(importNode, sourceFile) {
-    if (!(importNode.expression.kind == ts.SyntaxKind.Identifier &&
-        importNode.expression.escapedText == "require")) {
-        return;
-    }
-    const file = importNode.arguments[0].text;
-    if (/\.(less|css|scss|sass|svg|png|html)/.test(file)) {
-        const sourceFileDir = path.dirname(sourceFile.path);
-        const abs = path.join(sourceFileDir, file);
-        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
-        const relFile = path.relative(absSource, abs)
-        return ts.updateCall(importNode, importNode.expression, undefined, [ts.createStringLiteral(relFile)]);
-    }
-}
-
-const lessToStringTransformer = function (context) {
-    const options = context.getCompilerOptions();
-    return (sourceFile) => {
-        function visitor(node) {
-            // if (node && node.kind == ts.SyntaxKind.ImportDeclaration) {
-            //     return visitImportNode(node as ts.ImportDeclaration);
-            // }
-            if (!node)
-                return ts.visitEachChild(node, visitor, context);
-            if (ts.isCallExpression(node)) {
-                const result = visitRequireNode(node, sourceFile);
-                if (result)
-                    return result;
-            }
-            if (ts.isImportDeclaration(node)) {
-                const result = visitImportNode(node, sourceFile, options);
-                if (result)
-                    return result;
-            }
-            if (ts.isExportDeclaration(node)) {
-                const result = visitExportNode(node, sourceFile);
-                if (result)
-                    return result;
-            }
-            return ts.visitEachChild(node, visitor, context);
-        }
-
-        return ts.visitEachChild(sourceFile, visitor, context);
-    };
-};
-exports.default = function (program, pluginOptions) {
-    return lessToStringTransformer;
-}
+const ts = require("typescript");
+const path = require("path");
+const fs = require("fs");
+
+function visitExportNode(exportNode, sourceFile) {
+    if (exportNode.typeOnly){
+        console.log('type olnly')
+        return ;
+    }
+    const file = exportNode.moduleSpecifier?.text ?? exportNode.test;
+    if (!file)
+        return;
+    const sourceFileDir = path.dirname(sourceFile.path);
+    const abs = path.resolve(sourceFileDir, file);
+    if (/\.(less|css|scss|sass|svg|png|html)$/.test(file)) {
+        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
+        const relFile = path.relative(absSource, abs)
+        return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(relFile), exportNode.typeOnly);
+    }
+    if (fs.existsSync(abs + '.ts')) {
+        return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(file + '.js'), exportNode.typeOnly);
+    }
+    if (fs.existsSync(abs + '/')) {
+        const indexFile = `${file}/index.js`;
+        return ts.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, ts.createStringLiteral(indexFile), exportNode.typeOnly);
+    }
+}
+
+function visitImportNode(importNode, sourceFile, options) {
+    const file = importNode.moduleSpecifier?.text;
+    if (!file)
+        return;
+    const sourceFileDir = path.dirname(sourceFile.path);
+    const abs = path.resolve(sourceFileDir, file);
+    if (/\.(less|css|scss|sass|svg|png|html)$/.test(file)) {
+        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
+        const relFile = path.relative(absSource, abs)
+        return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(relFile));
+    }
+    if (fs.existsSync(abs + '.ts')) {
+        return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(file + '.js'));
+    }
+    if (fs.existsSync(abs + '/')) {
+        const indexFile = `${file}/index.js`;
+        return ts.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, ts.createStringLiteral(indexFile));
+    }
+}
+
+function visitRequireNode(importNode, sourceFile) {
+    if (!(importNode.expression.kind == ts.SyntaxKind.Identifier &&
+        importNode.expression.escapedText == "require")) {
+        return;
+    }
+    const file = importNode.arguments[0].text;
+    if (/\.(less|css|scss|sass|svg|png|html)/.test(file)) {
+        const sourceFileDir = path.dirname(sourceFile.path);
+        const abs = path.join(sourceFileDir, file);
+        const absSource = path.join(options.outDir, path.relative(options.baseUrl, sourceFileDir));
+        const relFile = path.relative(absSource, abs)
+        return ts.updateCall(importNode, importNode.expression, undefined, [ts.createStringLiteral(relFile)]);
+    }
+}
+
+const lessToStringTransformer = function (context) {
+    const options = context.getCompilerOptions();
+    return (sourceFile) => {
+        function visitor(node) {
+            // if (node && node.kind == ts.SyntaxKind.ImportDeclaration) {
+            //     return visitImportNode(node as ts.ImportDeclaration);
+            // }
+            if (!node)
+                return ts.visitEachChild(node, visitor, context);
+            if (ts.isCallExpression(node)) {
+                const result = visitRequireNode(node, sourceFile);
+                if (result)
+                    return result;
+            }
+            if (ts.isImportDeclaration(node)) {
+                const result = visitImportNode(node, sourceFile, options);
+                if (result)
+                    return result;
+            }
+            if (ts.isExportDeclaration(node)) {
+                const result = visitExportNode(node, sourceFile);
+                if (result)
+                    return result;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+
+        return ts.visitEachChild(sourceFile, visitor, context);
+    };
+};
+exports.default = function (program, pluginOptions) {
+    return lessToStringTransformer;
+}

package/readme.md

@@ -1,31 +1,31 @@
-## Builder and bundler for your projects
-
-### Use cases:
-* `cmmn compile [target] [-b] [--watch]`
-  > Runs typescript compiler
-  
-* `cmmn bundle [target] [-b] [--watch] [--run] [--prod]`
-  > Runs rollup bundler
-  
-* `cmmn gen name directory [-n]`
-  > Generates component with template at directory
-
-* default `jest.config.js`:
-    ```typescript
-    import config from "@cmmn/tools/test/config";
-    export default config;
-    ```
-  
-* tests: `some.spec.ts`
-  ```typescript
-    import {suite, test, expect} from "@cmmn/tools/test";
-    
-    @suite
-    export class SomeSpec {
-    
-        @test
-        equalsTest() {
-            expect(1).toBe(2);
-        }
-    }
+## Builder and bundler for your projects
+
+### Use cases:
+* `cmmn compile [target] [-b] [--watch]`
+  > Runs typescript compiler
+  
+* `cmmn bundle [target] [-b] [--watch] [--run] [--prod]`
+  > Runs rollup bundler
+  
+* `cmmn gen name directory [-n]`
+  > Generates component with template at directory
+
+* default `jest.config.js`:
+    ```typescript
+    import config from "@cmmn/tools/test/config";
+    export default config;
+    ```
+  
+* tests: `some.spec.ts`
+  ```typescript
+    import {suite, test, expect} from "@cmmn/tools/test";
+    
+    @suite
+    export class SomeSpec {
+    
+        @test
+        equalsTest() {
+            expect(1).toBe(2);
+        }
+    }
     ```

package/test/index.d.ts

@@ -1,2 +1,2 @@
-export {suite, test, timeout,} from "@testdeck/jest";
+export {suite, test, timeout,} from "@testdeck/jest";
 export {expect,} from "@jest/globals";

package/test/index.js

@@ -1,5 +1,5 @@
-export {suite, test, timeout,} from "@testdeck/jest";
-import * as globals from "@jest/globals";
-
-const {expect} = globals;
+export {suite, test, timeout,} from "@testdeck/jest";
+import * as globals from "@jest/globals";
+
+const {expect} = globals;
 export {expect};

package/test/jest.config.js

@@ -1,46 +1,46 @@
-import ts from "typescript";
-import {pathsToModuleNameMapper} from "ts-jest";
-
-const options = getTSConfig();
-
-export default {
-    transform: {
-        '^.+\\.tsx?$': ['@swc/jest', {
-            jsc: {
-                parser: {
-                    syntax: "typescript",
-                    // tsx: true, // If you use react
-                    dynamicImport: true,
-                    decorators: true,
-                },
-                target: "es2021",
-                transform: {
-                    decoratorMetadata: true,
-                },
-                paths: options.paths,
-                baseUrl: '.'
-            },
-        }],
-    },
-    roots: [process.cwd()],
-    moduleNameMapper: pathsToModuleNameMapper(options.paths ?? {}, {
-        prefix: '<rootDir>'
-    }),
-    extensionsToTreatAsEsm: ['.ts', '.tsx', '.jsx?'],
-}
-
-
-function getTSConfig() {
-    const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists, 'tsconfig.json');
-    const readConfigFileResult = ts.readConfigFile(configPath, ts.sys.readFile);
-    if (readConfigFileResult.error) {
-        throw new Error(ts.formatDiagnostic(readConfigFileResult.error, formatHost));
-    }
-    const jsonConfig = readConfigFileResult.config;
-    const convertResult = ts.convertCompilerOptionsFromJson(jsonConfig.compilerOptions, './');
-    if (convertResult.errors && convertResult.errors.length > 0) {
-        throw new Error(ts.formatDiagnostics(convertResult.errors, formatHost));
-    }
-    const compilerOptions = convertResult.options;
-    return compilerOptions;
+import ts from "typescript";
+import {pathsToModuleNameMapper} from "ts-jest";
+
+const options = getTSConfig();
+
+export default {
+    transform: {
+        '^.+\\.tsx?$': ['@swc/jest', {
+            jsc: {
+                parser: {
+                    syntax: "typescript",
+                    // tsx: true, // If you use react
+                    dynamicImport: true,
+                    decorators: true,
+                },
+                target: "es2021",
+                transform: {
+                    decoratorMetadata: true,
+                },
+                paths: options.paths,
+                baseUrl: '.'
+            },
+        }],
+    },
+    roots: [process.cwd()],
+    moduleNameMapper: pathsToModuleNameMapper(options.paths ?? {}, {
+        prefix: '<rootDir>'
+    }),
+    extensionsToTreatAsEsm: ['.ts', '.tsx', '.jsx?'],
+}
+
+
+function getTSConfig() {
+    const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists, 'tsconfig.json');
+    const readConfigFileResult = ts.readConfigFile(configPath, ts.sys.readFile);
+    if (readConfigFileResult.error) {
+        throw new Error(ts.formatDiagnostic(readConfigFileResult.error, formatHost));
+    }
+    const jsonConfig = readConfigFileResult.config;
+    const convertResult = ts.convertCompilerOptionsFromJson(jsonConfig.compilerOptions, './');
+    if (convertResult.errors && convertResult.errors.length > 0) {
+        throw new Error(ts.formatDiagnostics(convertResult.errors, formatHost));
+    }
+    const compilerOptions = convertResult.options;
+    return compilerOptions;
 }