@codenotch/codenotch.cli 1.0.36 → 1.0.37

package/dist/utils/ScriptDeclarationUtils.js

@@ -0,0 +1,398 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const typescript_1 = __importDefault(require("typescript"));
+const TypeSchemaUtils_1 = __importDefault(require("./TypeSchemaUtils"));
+/**
+ * Reads Codenotch declarations (processes, tables, documents...) out of a script.
+ *
+ * The script is parsed with the TypeScript compiler and never executed, so discovering a
+ * declaration cannot run any project code. Only what is written literally is reported: an id
+ * built at runtime is flagged rather than guessed.
+ *
+ * Parsing is tolerant: a file that does not compile is read on a best effort basis rather than
+ * throwing, so an unfinished declaration is still reported. Reporting the syntax errors themselves
+ * is the job of the validators, not of this discovery.
+ */
+class ScriptDeclarationUtils {
+    /**
+     * Finds every call to one of `factoryNames`, imported from `moduleName`, in a script.
+     *
+     * Named imports, aliases (`import { process as proc }`) and namespace imports
+     * (`import * as cn` then `cn.process(...)`) are all recognized, and a factory that is not
+     * imported from that module is never reported, so a local function of the same name is ignored.
+     *
+     * @param filePath path of the script, only used to pick the syntax (tsx, jsx, ts, js)
+     * @param content source of the script
+     * @param moduleName module the factories must come from, e.g. '@codenotch/process'
+     * @param factoryNames declaring factories to look for, e.g. ['process']
+     */
+    static findDeclarationCalls(filePath, content, moduleName, factoryNames) {
+        return this.analyzeScript(filePath, content, moduleName, factoryNames).declarations;
+    }
+    /**
+     * Same as {@link ScriptDeclarationUtils.findDeclarationCalls}, and also reports the type aliases
+     * built with one of `typeHelperNames`, such as `export type IUser = InferEntity<typeof User>`.
+     */
+    static analyzeScript(filePath, content, moduleName, factoryNames, typeHelperNames = []) {
+        const sourceFile = typescript_1.default.createSourceFile(filePath, content, typescript_1.default.ScriptTarget.Latest, true, this.getScriptKind(filePath));
+        // Every name imported from the module: local name -> name inside the module
+        const imported = new Map();
+        // Names bound by 'import * as x', used as 'x.process(...)'
+        const namespaces = new Set();
+        this.collectImports(sourceFile, moduleName, imported, namespaces);
+        if (imported.size === 0 && namespaces.size === 0) {
+            return { declarations: [], typeAliases: [] };
+        }
+        const declarations = [];
+        const visit = (node) => {
+            if (typescript_1.default.isCallExpression(node)) {
+                const callee = this.resolveCallee(node.expression, imported, namespaces);
+                if (callee !== undefined && factoryNames.includes(callee)) {
+                    declarations.push(this.readDeclarationCall(node, callee, sourceFile, imported, namespaces));
+                }
+            }
+            typescript_1.default.forEachChild(node, visit);
+        };
+        visit(sourceFile);
+        return {
+            declarations,
+            typeAliases: typeHelperNames.length === 0 ? [] : this.findTypeAliases(sourceFile, typeHelperNames, imported, namespaces)
+        };
+    }
+    /**
+     * Reads the `export type IUser = InferEntity<typeof User>` aliases of a script
+     */
+    static findTypeAliases(sourceFile, typeHelperNames, imported, namespaces) {
+        const results = [];
+        for (const statement of sourceFile.statements) {
+            if (!typescript_1.default.isTypeAliasDeclaration(statement) || !typescript_1.default.isTypeReferenceNode(statement.type)) {
+                continue;
+            }
+            const helper = this.resolveTypeName(statement.type.typeName, imported, namespaces);
+            if (helper === undefined || !typeHelperNames.includes(helper)) {
+                continue;
+            }
+            // The 'typeof User' of InferEntity<typeof User>
+            const argument = statement.type.typeArguments?.[0];
+            const targetName = argument !== undefined && typescript_1.default.isTypeQueryNode(argument) && typescript_1.default.isIdentifier(argument.exprName)
+                ? argument.exprName.text
+                : undefined;
+            results.push({
+                name: statement.name.text,
+                isExported: (statement.modifiers ?? []).some(modifier => modifier.kind === typescript_1.default.SyntaxKind.ExportKeyword),
+                helper,
+                targetName
+            });
+        }
+        return results;
+    }
+    /**
+     * Name of a type in terms of the module it comes from, or undefined when it is unrelated to it
+     */
+    static resolveTypeName(typeName, imported, namespaces) {
+        if (typescript_1.default.isIdentifier(typeName)) {
+            return imported.get(typeName.text);
+        }
+        // orm.InferEntity<...>, through 'import * as orm'
+        if (typescript_1.default.isIdentifier(typeName.left) && namespaces.has(typeName.left.text)) {
+            return typeName.right.text;
+        }
+        return undefined;
+    }
+    static getScriptKind(filePath) {
+        const lowerCased = filePath.toLowerCase();
+        if (lowerCased.endsWith('.tsx')) {
+            return typescript_1.default.ScriptKind.TSX;
+        }
+        if (lowerCased.endsWith('.jsx')) {
+            return typescript_1.default.ScriptKind.JSX;
+        }
+        if (lowerCased.endsWith('.js') || lowerCased.endsWith('.mjs') || lowerCased.endsWith('.cjs')) {
+            return typescript_1.default.ScriptKind.JS;
+        }
+        return typescript_1.default.ScriptKind.TS;
+    }
+    static collectImports(sourceFile, moduleName, imported, namespaces) {
+        for (const statement of sourceFile.statements) {
+            if (!typescript_1.default.isImportDeclaration(statement) || !typescript_1.default.isStringLiteral(statement.moduleSpecifier)) {
+                continue;
+            }
+            if (statement.moduleSpecifier.text !== moduleName || statement.importClause === undefined) {
+                continue;
+            }
+            const bindings = statement.importClause.namedBindings;
+            if (bindings !== undefined && typescript_1.default.isNamespaceImport(bindings)) {
+                namespaces.add(bindings.name.text);
+            }
+            else if (bindings !== undefined && typescript_1.default.isNamedImports(bindings)) {
+                for (const element of bindings.elements) {
+                    // 'process as proc' gives propertyName 'process' and name 'proc'
+                    imported.set(element.name.text, (element.propertyName ?? element.name).text);
+                }
+            }
+        }
+    }
+    /**
+     * Name of a called expression in terms of the module it comes from: 'process', 'api.post', ...
+     * Returns undefined when the expression has nothing to do with the module.
+     */
+    static resolveCallee(expression, imported, namespaces) {
+        // process({ ... })
+        if (typescript_1.default.isIdentifier(expression)) {
+            return imported.get(expression.text);
+        }
+        if (typescript_1.default.isPropertyAccessExpression(expression) && typescript_1.default.isIdentifier(expression.expression)) {
+            // cn.process({ ... }), through 'import * as cn'
+            if (namespaces.has(expression.expression.text)) {
+                return expression.name.text;
+            }
+            // api.post('/books'), where 'api' is imported from the module
+            const root = imported.get(expression.expression.text);
+            if (root !== undefined) {
+                return `${root}.${expression.name.text}`;
+            }
+        }
+        return undefined;
+    }
+    static readDeclarationCall(call, factory, sourceFile, imported, namespaces) {
+        const properties = {};
+        const calls = {};
+        const functions = {};
+        const argument = call.arguments[0];
+        let hasIdProperty = false;
+        if (argument !== undefined && typescript_1.default.isObjectLiteralExpression(argument)) {
+            const literal = this.readLiteralValue(argument);
+            if (literal !== undefined && typeof literal.literal === 'object' && literal.literal !== null && !Array.isArray(literal.literal)) {
+                Object.assign(properties, literal.literal);
+            }
+            this.collectCalls(argument, '', imported, namespaces, calls);
+            this.collectFunctions(argument, functions);
+            hasIdProperty = argument.properties.some(property => property.name !== undefined && this.getPropertyName(property.name) === 'id');
+        }
+        const id = typeof properties['id'] === 'string' ? properties['id'] : undefined;
+        const { variableName, isExported } = this.getAssignedVariable(call);
+        return {
+            factory,
+            id,
+            // An id that is present but absent from the literal properties was computed
+            isIdStatic: id !== undefined || !hasIdProperty,
+            variableName,
+            isExported,
+            line: sourceFile.getLineAndCharacterOfPosition(call.getStart(sourceFile)).line + 1,
+            properties,
+            calls,
+            functions
+        };
+    }
+    /**
+     * Records the signature of every property holding a function, whether written as an arrow
+     * function, a function expression or a method: `run: async (ctx, input) => ...` and
+     * `async run(ctx, input) { ... }` are read the same way.
+     */
+    static collectFunctions(objectLiteral, results) {
+        for (const property of objectLiteral.properties) {
+            let name;
+            let fn;
+            if (typescript_1.default.isPropertyAssignment(property) && (typescript_1.default.isArrowFunction(property.initializer) || typescript_1.default.isFunctionExpression(property.initializer))) {
+                name = this.getPropertyName(property.name);
+                fn = property.initializer;
+            }
+            else if (typescript_1.default.isMethodDeclaration(property)) {
+                name = this.getPropertyName(property.name);
+                fn = property;
+            }
+            if (name === undefined || fn === undefined) {
+                continue;
+            }
+            results[name] = {
+                parameters: fn.parameters.map(parameter => ({
+                    name: typescript_1.default.isIdentifier(parameter.name) ? parameter.name.text : parameter.name.getText(),
+                    schema: parameter.type === undefined ? undefined : TypeSchemaUtils_1.default.fromTypeNode(parameter.type),
+                    typeText: parameter.type?.getText(),
+                    isOptional: parameter.questionToken !== undefined || parameter.initializer !== undefined
+                })),
+                returnSchema: fn.type === undefined ? undefined : TypeSchemaUtils_1.default.fromTypeNode(fn.type),
+                returnTypeText: fn.type?.getText(),
+                isAsync: (typescript_1.default.canHaveModifiers(fn) ? typescript_1.default.getModifiers(fn) ?? [] : []).some(modifier => modifier.kind === typescript_1.default.SyntaxKind.AsyncKeyword)
+            };
+        }
+    }
+    /**
+     * Walks an object literal and records every property whose value is a call, keyed by its path,
+     * so that the columns of `properties: { id: p.integer() }` are reachable as 'properties.id'.
+     */
+    static collectCalls(objectLiteral, prefix, imported, namespaces, results) {
+        for (const property of objectLiteral.properties) {
+            // Shorthand ({ id }), spreads ({ ...base }) and methods hold no readable value
+            if (!typescript_1.default.isPropertyAssignment(property)) {
+                continue;
+            }
+            const name = this.getPropertyName(property.name);
+            if (name === undefined) {
+                continue;
+            }
+            const path = prefix === '' ? name : `${prefix}.${name}`;
+            const value = property.initializer;
+            if (typescript_1.default.isCallExpression(value)) {
+                results[path] = this.readCallChain(value, imported, namespaces);
+            }
+            else if (typescript_1.default.isObjectLiteralExpression(value)) {
+                this.collectCalls(value, path, imported, namespaces, results);
+            }
+        }
+    }
+    /**
+     * Reads a call or a chain of calls: `p.text().default('')` gives the root 'p' and the
+     * steps 'text' then 'default'.
+     */
+    static readCallChain(call, imported, namespaces) {
+        const steps = [];
+        let current = call;
+        let root = '';
+        // Walk the chain from its end back to its root, hence the unshift
+        while (true) {
+            if (typescript_1.default.isCallExpression(current)) {
+                const args = this.readArguments(current);
+                if (typescript_1.default.isPropertyAccessExpression(current.expression)) {
+                    steps.unshift({ name: current.expression.name.text, ...args });
+                    current = current.expression.expression;
+                    continue;
+                }
+                if (typescript_1.default.isIdentifier(current.expression)) {
+                    // The root itself is called, as in timer('0 8 * * *')
+                    root = this.resolveRoot(current.expression, imported, namespaces);
+                    steps.unshift({ name: root, ...args });
+                    break;
+                }
+                root = current.expression.getText();
+                break;
+            }
+            if (typescript_1.default.isIdentifier(current)) {
+                root = this.resolveRoot(current, imported, namespaces);
+                break;
+            }
+            root = current.getText();
+            break;
+        }
+        const names = steps.map(step => step.name);
+        const callee = root === '' || names[0] === root
+            // A namespace is the module itself, and a root that is called is already the first step
+            ? names.join('.')
+            : [root, ...names].join('.');
+        const last = steps[steps.length - 1];
+        return {
+            root,
+            steps,
+            callee,
+            arguments: last?.arguments ?? [],
+            hasComputedArguments: steps.some(step => step.hasComputedArguments)
+        };
+    }
+    /**
+     * Name a chain starts from, under its module name. Empty for a namespace import, which
+     * designates the module itself rather than a value: 'cn.timer(...)' is just 'timer'.
+     */
+    static resolveRoot(identifier, imported, namespaces) {
+        if (namespaces.has(identifier.text)) {
+            return '';
+        }
+        return imported.get(identifier.text) ?? identifier.text;
+    }
+    static readArguments(call) {
+        const args = [];
+        let hasComputedArguments = false;
+        for (const argument of call.arguments) {
+            const value = this.readLiteralValue(argument);
+            if (value === undefined) {
+                hasComputedArguments = true;
+                continue;
+            }
+            args.push(value.literal);
+        }
+        return { arguments: args, hasComputedArguments };
+    }
+    /**
+     * Value of an expression when it is written literally, undefined when it is only known at runtime.
+     * Wrapped in an object so that a literal 'null' is not confused with 'not a literal'.
+     */
+    static readLiteralValue(node) {
+        if (typescript_1.default.isStringLiteral(node) || typescript_1.default.isNoSubstitutionTemplateLiteral(node)) {
+            return { literal: node.text };
+        }
+        if (typescript_1.default.isNumericLiteral(node)) {
+            return { literal: Number(node.text) };
+        }
+        if (node.kind === typescript_1.default.SyntaxKind.TrueKeyword) {
+            return { literal: true };
+        }
+        if (node.kind === typescript_1.default.SyntaxKind.FalseKeyword) {
+            return { literal: false };
+        }
+        if (node.kind === typescript_1.default.SyntaxKind.NullKeyword) {
+            return { literal: null };
+        }
+        // -1 and friends
+        if (typescript_1.default.isPrefixUnaryExpression(node) && node.operator === typescript_1.default.SyntaxKind.MinusToken && typescript_1.default.isNumericLiteral(node.operand)) {
+            return { literal: -Number(node.operand.text) };
+        }
+        // 'x satisfies T' and 'x as T' do not change the value
+        if (typescript_1.default.isAsExpression(node) || typescript_1.default.isSatisfiesExpression(node) || typescript_1.default.isParenthesizedExpression(node)) {
+            return this.readLiteralValue(node.expression);
+        }
+        if (typescript_1.default.isArrayLiteralExpression(node)) {
+            const items = [];
+            for (const element of node.elements) {
+                const value = this.readLiteralValue(element);
+                if (value === undefined) {
+                    // A single computed item makes the whole array unknown
+                    return undefined;
+                }
+                items.push(value.literal);
+            }
+            return { literal: items };
+        }
+        if (typescript_1.default.isObjectLiteralExpression(node)) {
+            const record = {};
+            for (const property of node.properties) {
+                if (!typescript_1.default.isPropertyAssignment(property)) {
+                    continue;
+                }
+                const name = this.getPropertyName(property.name);
+                const value = name === undefined ? undefined : this.readLiteralValue(property.initializer);
+                if (name !== undefined && value !== undefined) {
+                    record[name] = value.literal;
+                }
+                // A computed member is left out, the rest of the object stays usable
+            }
+            return { literal: record };
+        }
+        return undefined;
+    }
+    static getPropertyName(name) {
+        if (typescript_1.default.isIdentifier(name) || typescript_1.default.isStringLiteral(name) || typescript_1.default.isNumericLiteral(name)) {
+            return name.text;
+        }
+        return undefined;
+    }
+    /**
+     * Variable the call is assigned to, e.g. 'createBook' in `export const createBook = process({...})`
+     */
+    static getAssignedVariable(call) {
+        const declaration = call.parent;
+        if (declaration === undefined || !typescript_1.default.isVariableDeclaration(declaration) || declaration.initializer !== call) {
+            return { isExported: false };
+        }
+        const variableName = typescript_1.default.isIdentifier(declaration.name) ? declaration.name.text : undefined;
+        // VariableDeclaration -> VariableDeclarationList -> VariableStatement, which carries the 'export'
+        const statement = declaration.parent?.parent;
+        const isExported = statement !== undefined
+            && typescript_1.default.isVariableStatement(statement)
+            && (statement.modifiers ?? []).some(modifier => modifier.kind === typescript_1.default.SyntaxKind.ExportKeyword);
+        return { variableName, isExported };
+    }
+}
+exports.default = ScriptDeclarationUtils;
+//# sourceMappingURL=ScriptDeclarationUtils.js.map

package/dist/utils/ScriptDeclarationUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScriptDeclarationUtils.js","sourceRoot":"","sources":["../../src/utils/ScriptDeclarationUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/ServeUtils.js

@@ -43,8 +43,8 @@ const ConsoleUtils_1 = __importDefault(require("./ConsoleUtils"));
 class ServeUtils {
     static async serveApp(directory, options) {
         const port = options.port || 5000;
-        const isAbsolutePath = directory && (directory.startsWith('/') || directory.match(/^[a-zA-Z]:\\/));
-        const targetDir = (0, path_1.resolve)(isAbsolutePath ? directory : (0, path_1.join)(process.cwd(), directory));
+        // resolve() already turns a relative path into an absolute one, based on the current directory
+        const targetDir = (0, path_1.resolve)(directory ?? '.');
         const indexPath = (0, path_1.resolve)(targetDir, options.index || 'index.html');
         if (!(0, fs_1.existsSync)(targetDir)) {
             console.log(chalk_1.default.red(`Error: Target directory not found (${targetDir})`));
@@ -68,9 +68,14 @@ class ServeUtils {
         if ((0, fs_1.existsSync)(envPath)) {
             let envContent = (0, fs_1.readFileSync)(envPath, 'utf8');
             envContent.split('\n').forEach(line => {
-                let [key, value] = line.split('=');
-                if (key && value) {
-                    envVariables.push({ name: key.trim(), value: value.trim() });
+                // Split on the first '=' only: json manifests and tokens hold '=' in their value
+                const separator = line.indexOf('=');
+                if (separator > 0) {
+                    const key = line.substring(0, separator).trim();
+                    const value = line.substring(separator + 1).trim();
+                    if (key !== '' && value !== '') {
+                        envVariables.push({ name: key, value: value });
+                    }
                 }
             });
             console.log(chalk_1.default.green(`Loaded environment variables from "${envPath}":`));

package/dist/utils/ServeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServeUtils.js","sourceRoot":"","sources":["../../src/utils/ServeUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServeUtils.js","sourceRoot":"","sources":["../../src/utils/ServeUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/ShellUtils.d.ts

@@ -1,3 +1,9 @@
 export default abstract class ShellUtils {
+    /**
+     * Runs a command with its output streamed to the terminal as it comes, unlike {@link ShellUtils.exec}
+     * which buffers it until the end. Meant for long commands such as 'npm install', where silence
+     * reads as a hang. Resolves with the exit code, and never rejects: a failure is a non zero code.
+     */
+    static run(location: string, command: string): Promise<number>;
     static exec(location: string, command: string, info?: string, silent?: boolean): Promise<void>;
 }

package/dist/utils/ShellUtils.js

@@ -2,6 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 class ShellUtils {
+    /**
+     * Runs a command with its output streamed to the terminal as it comes, unlike {@link ShellUtils.exec}
+     * which buffers it until the end. Meant for long commands such as 'npm install', where silence
+     * reads as a hang. Resolves with the exit code, and never rejects: a failure is a non zero code.
+     */
+    static run(location, command) {
+        return new Promise(resolve => {
+            // A shell is needed for 'npm', which is 'npm.cmd' on windows
+            const child = (0, child_process_1.spawn)(command, { cwd: location, shell: true, stdio: 'inherit' });
+            child.on('error', () => resolve(1));
+            child.on('close', code => resolve(code ?? 1));
+        });
+    }
     static async exec(location, command, info, silent = false) {
         if (info)
             console.log(info + "...");

package/dist/utils/ShellUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ShellUtils.js","sourceRoot":"","sources":["../../src/utils/ShellUtils.ts"],"names":[],"mappings":";;AAAA,iDAAqC;AAErC,MAA8B,UAAU;IAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAgB,EAAE,OAAe,EAAE,IAAa,EAAE,SAAkB,KAAK;QAE9F,IAAG,IAAI;YACH,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClC,IAAA,oBAAI,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,KAAU,EAAE,MAAW,EAAE,MAAW,EAAE,EAAE;gBACtE,IAAI,KAAK,EAAE,CAAC;oBACR,IAAI,CAAC,MAAM,EAAE,CAAC;wBACV,OAAO,CAAC,KAAK,CAAC,eAAe,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;oBACnD,CAAC;oBACD,MAAM,CAAC,KAAK,CAAC,CAAC;gBAClB,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,MAAM,EAAE,CAAC;wBACV,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBACpB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAC1B,CAAC;oBACD,OAAO,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAtBD,6BAsBC"}
+{"version":3,"file":"ShellUtils.js","sourceRoot":"","sources":["../../src/utils/ShellUtils.ts"],"names":[],"mappings":";;AAAA,iDAA4C;AAE5C,MAA8B,UAAU;IAEpC;;;;OAIG;IACI,MAAM,CAAC,GAAG,CAAC,QAAgB,EAAE,OAAe;QAC/C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,6DAA6D;YAC7D,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAC/E,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAgB,EAAE,OAAe,EAAE,IAAa,EAAE,SAAkB,KAAK;QAE9F,IAAG,IAAI;YACH,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClC,IAAA,oBAAI,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,KAAU,EAAE,MAAW,EAAE,MAAW,EAAE,EAAE;gBACtE,IAAI,KAAK,EAAE,CAAC;oBACR,IAAI,CAAC,MAAM,EAAE,CAAC;wBACV,OAAO,CAAC,KAAK,CAAC,eAAe,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;oBACnD,CAAC;oBACD,MAAM,CAAC,KAAK,CAAC,CAAC;gBAClB,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,MAAM,EAAE,CAAC;wBACV,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBACpB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAC1B,CAAC;oBACD,OAAO,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AArCD,6BAqCC"}

package/dist/utils/TemplateUtils.d.ts

@@ -0,0 +1,62 @@
+import { IAppManifest } from '@codenotch/codenotch.core';
+/**
+ * An app name is used both as the file name and as the React component name, it must be a valid identifier
+ */
+export declare const APP_NAME_PATTERN: RegExp;
+/**
+ * Single source of truth for the content of the files generated by the CLI.
+ *
+ * Both 'cn project new' (which scaffolds a whole project) and 'cn generate ...'
+ * (which generates one file at a time) build their files from here, so a template
+ * only has to be updated once.
+ */
+export default abstract class TemplateUtils {
+    static isValidAppName(appName: string): boolean;
+    /**
+     * Empty React app, e.g. 'apps/index.tsx'
+     */
+    static createAppTsx(appName: string): string;
+    /**
+     * Manifest of an app, e.g. 'apps/index.manifest.json'
+     */
+    static createAppManifest(appName: string): IAppManifest;
+    /**
+     * package.json of a Codenotch project
+     * @param name npm package name, usually the service name of the project
+     * @param extra dependencies a template adds on top of the base ones
+     * @param withReact false for a project without any app, which needs no React at all
+     */
+    static createPackageJson(name: string, extra?: {
+        dependencies?: Record<string, string>;
+        devDependencies?: Record<string, string>;
+    }, withReact?: boolean): {
+        name: string;
+        version: string;
+        description: string;
+        main: string;
+        scripts: {};
+        keywords: never[];
+        author: string;
+        license: string;
+        dependencies: {
+            react?: string | undefined;
+            'react-dom'?: string | undefined;
+            '@codenotch/codenotch.react'?: string | undefined;
+        };
+        devDependencies: {
+            typescript: string;
+            '@types/react'?: string | undefined;
+            '@types/react-dom'?: string | undefined;
+            '@vitejs/plugin-react'?: string | undefined;
+        };
+    };
+    /**
+     * Folders of a new project, relative to its root
+     */
+    static readonly PROJECT_FOLDERS: string[];
+    static createGitignore(): string;
+    /**
+     * readme.md of a new project: what the generated files are and how to work with them
+     */
+    static createReadmeMd(projectName: string, serviceName: string): string;
+}