@loomweaver/devkit 0.7.4 → 0.7.6

package/src/generators/weaver/generator.js

@@ -1,69 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.weaverGenerator = weaverGenerator;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const generate_1 = require("../../lib/generate/generate");
 const shared_1 = require("../shared");
 const recipe_1 = require("../../recipes/angular-weaver/recipe");
 const nx_files_1 = require("./nx-files");
-function weaverGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const baseTsconfig = (0, shared_1.tsconfigPathsFile)(tree);
-        const app = appFor(tree, options);
-        const project = (0, nx_files_1.nxWeaverProject)({
-            id: options.id,
-            projectName: options.projectName,
-            directory: options.directory,
-            importPath: options.importPath,
-            scope: (0, shared_1.workspaceScope)(tree),
-            tags: (_a = options.tags) === null || _a === void 0 ? void 0 : _a.split(',').map((tag) => tag.trim()),
-            prefix: options.prefix,
-            buildTarget: app ? `${app}:build:development` : undefined,
-            baseTsconfig,
-        });
-        if (tree.exists(`${project.projectRoot}/project.json`)) {
-            throw new Error(`A project already exists at ${project.projectRoot}.`);
-        }
-        const source = (0, generate_1.generate)(recipe_1.angularWeaver, {
-            id: options.id,
-            name: options.name,
-            prefix: project.prefix,
-            importPath: project.importPath,
-            features: {
-                command: options.command,
-                menu: options.menu,
-                settings: options.settings,
-                access: options.access,
-                shortcut: options.shortcut,
-                barItem: options.barItem,
-                about: options.about,
-                instanceable: options.instanceable,
-                container: options.container,
-                spec: options.spec,
-            },
-        });
-        (0, shared_1.writeFiles)(tree, project.projectRoot, source, (0, nx_files_1.nxWeaverFiles)(project));
-        (0, devkit_1.updateJson)(tree, baseTsconfig, (json) => {
-            var _a, _b;
-            var _c;
-            (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : (json.compilerOptions = {});
-            (_b = (_c = json.compilerOptions).paths) !== null && _b !== void 0 ? _b : (_c.paths = {});
-            json.compilerOptions.paths[project.importPath] = [
-                `./${project.projectRoot}/src/index.ts`,
-            ];
-            return json;
-        });
-        if (app) {
-            (0, shared_1.addI18nAssetsGlob)(tree, app, {
-                input: `${project.projectRoot}/src/lib/i18n`,
-                output: `i18n/${options.id}`,
-            });
-            (0, shared_1.addTailwindSource)(tree, app, `${project.projectRoot}/src`);
-        }
-        yield (0, devkit_1.formatFiles)(tree);
+async function weaverGenerator(tree, options) {
+    const baseTsconfig = (0, shared_1.tsconfigPathsFile)(tree);
+    const app = appFor(tree, options);
+    const project = (0, nx_files_1.nxWeaverProject)({
+        id: options.id,
+        projectName: options.projectName,
+        directory: options.directory,
+        importPath: options.importPath,
+        scope: (0, shared_1.workspaceScope)(tree),
+        tags: options.tags?.split(',').map((tag) => tag.trim()),
+        prefix: options.prefix,
+        buildTarget: app ? `${app}:build:development` : undefined,
+        baseTsconfig,
+    });
+    if (tree.exists(`${project.projectRoot}/project.json`)) {
+        throw new Error(`A project already exists at ${project.projectRoot}.`);
+    }
+    const source = (0, generate_1.generate)(recipe_1.angularWeaver, {
+        id: options.id,
+        name: options.name,
+        prefix: project.prefix,
+        importPath: project.importPath,
+        features: {
+            command: options.command,
+            menu: options.menu,
+            settings: options.settings,
+            access: options.access,
+            shortcut: options.shortcut,
+            barItem: options.barItem,
+            about: options.about,
+            instanceable: options.instanceable,
+            container: options.container,
+            spec: options.spec,
+        },
+    });
+    (0, shared_1.writeFiles)(tree, project.projectRoot, source, (0, nx_files_1.nxWeaverFiles)(project));
+    (0, devkit_1.updateJson)(tree, baseTsconfig, (json) => {
+        json.compilerOptions ??= {};
+        json.compilerOptions.paths ??= {};
+        json.compilerOptions.paths[project.importPath] = [
+            `./${project.projectRoot}/src/index.ts`,
+        ];
+        return json;
     });
+    if (app) {
+        (0, shared_1.addI18nAssetsGlob)(tree, app, {
+            input: `${project.projectRoot}/src/lib/i18n`,
+            output: `i18n/${options.id}`,
+        });
+        (0, shared_1.addTailwindSource)(tree, app, `${project.projectRoot}/src`);
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 function appFor(tree, options) {
     if (options.unitTestRunner === 'none') {

package/src/generators/weaver/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/generators/weaver/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/generators/weaver/generator.ts"],"names":[],"mappings":"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"}

package/src/generators/weaver/nx-files.js

@@ -4,18 +4,18 @@ exports.nxWeaverProject = nxWeaverProject;
 exports.nxWeaverFiles = nxWeaverFiles;
 const nx_scaffold_shared_1 = require("../nx-scaffold-shared");
 function nxWeaverProject(options) {
-    var _a, _b, _c, _d, _e, _f;
-    const projectName = (_a = options.projectName) !== null && _a !== void 0 ? _a : `${options.id}-weaver`;
-    const projectRoot = (_b = options.directory) !== null && _b !== void 0 ? _b : `libs/${projectName}`;
+    const projectName = options.projectName ?? `${options.id}-weaver`;
+    const projectRoot = options.directory ?? `libs/${projectName}`;
     return {
         id: options.id,
         projectName,
         projectRoot,
-        importPath: (_c = options.importPath) !== null && _c !== void 0 ? _c : (options.scope ? `${options.scope}/${projectName}` : projectName),
-        tags: (_d = options.tags) !== null && _d !== void 0 ? _d : [],
-        prefix: (_e = options.prefix) !== null && _e !== void 0 ? _e : 'lw',
+        importPath: options.importPath ??
+            (options.scope ? `${options.scope}/${projectName}` : projectName),
+        tags: options.tags ?? [],
+        prefix: options.prefix ?? 'lw',
         buildTarget: options.buildTarget,
-        baseTsconfig: (_f = options.baseTsconfig) !== null && _f !== void 0 ? _f : 'tsconfig.base.json',
+        baseTsconfig: options.baseTsconfig ?? 'tsconfig.base.json',
         depth: (0, nx_scaffold_shared_1.depthFor)(projectRoot),
     };
 }
@@ -27,15 +27,16 @@ function projectJson(p) {
         prefix: p.prefix,
         projectType: 'library',
         tags: p.tags,
-        targets: Object.assign(Object.assign({}, (p.buildTarget
-            ? {
+        targets: {
+            ...(p.buildTarget && {
                 test: {
                     executor: '@nx/angular:unit-test',
                     outputs: ['{workspaceRoot}/coverage/{projectName}'],
                     options: { buildTarget: p.buildTarget, watch: false },
                 },
-            }
-            : {})), { lint: { executor: '@nx/eslint:lint' } }),
+            }),
+            lint: { executor: '@nx/eslint:lint' },
+        },
     }, null, 2);
 }
 function tsconfig(p) {
@@ -51,7 +52,7 @@ function tsconfig(p) {
         ],
     }, null, 2);
 }
-function tsconfigLib(p) {
+function tsconfigLibrary(p) {
     return JSON.stringify({
         extends: './tsconfig.json',
         compilerOptions: {
@@ -66,8 +67,12 @@ function tsconfigLib(p) {
     }, null, 2);
 }
 function nxWeaverFiles(p) {
-    return Object.assign(Object.assign({ 'project.json': projectJson(p) + '\n', 'tsconfig.json': tsconfig(p) + '\n', 'tsconfig.lib.json': tsconfigLib(p) + '\n' }, (p.buildTarget
-        ? { 'tsconfig.spec.json': (0, nx_scaffold_shared_1.sharedTsconfigSpec)(p.depth) + '\n' }
-        : {})), { 'eslint.config.mjs': (0, nx_scaffold_shared_1.sharedEslintConfig)(p.depth, p.prefix) });
+    return {
+        'project.json': projectJson(p) + '\n',
+        'tsconfig.json': tsconfig(p) + '\n',
+        'tsconfig.lib.json': tsconfigLibrary(p) + '\n',
+        ...(p.buildTarget && { 'tsconfig.spec.json': (0, nx_scaffold_shared_1.sharedTsconfigSpec)(p.depth) + '\n' }),
+        'eslint.config.mjs': (0, nx_scaffold_shared_1.sharedEslintConfig)(p.depth, p.prefix),
+    };
 }
 //# sourceMappingURL=nx-files.js.map

package/src/generators/weaver/nx-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"nx-files.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/generators/weaver/nx-files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nx-files.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/generators/weaver/nx-files.ts"],"names":[],"mappings":"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"}

package/src/lib/amend/compose.js

@@ -2,8 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.composePlugin = composePlugin;
 exports.composeLines = composeLines;
-const PROVIDERS = /(export\s+const\s+appConfig\s*:[^=]*=\s*\{[\s\S]*?providers\s*:\s*\[)([\s\S]*?)(\n(\s*)\],)/;
+const APP_CONFIG = /export\s+const\s+appConfig\s*:[^=]*=\s*\{/;
+const PROVIDERS_OPEN = /providers\s*:\s*\[/g;
 const SHELL_IMPORT = /import\s*\{([^}]*)\}\s*from\s*'@loomweaver\/shell';/;
+function closingLine(source, from) {
+    let close = source.indexOf('],', from);
+    while (close !== -1) {
+        let start = close;
+        while (start > from && source.charAt(start - 1).trim() === '') {
+            start -= 1;
+        }
+        const gap = source.slice(start, close);
+        const newline = gap.indexOf('\n');
+        if (newline !== -1) {
+            return { insertAt: start + newline, indent: gap.slice(newline + 1) };
+        }
+        close = source.indexOf('],', close + 2);
+    }
+    return null;
+}
+function providersBlock(source) {
+    const declaration = APP_CONFIG.exec(source);
+    if (!declaration) {
+        return null;
+    }
+    PROVIDERS_OPEN.lastIndex = declaration.index + declaration[0].length;
+    const open = PROVIDERS_OPEN.exec(source);
+    return open ? closingLine(source, open.index + open[0].length) : null;
+}
 /**
  * Registers a generated plugin in a composition root we generated ourselves. Recognition is the
  * whole safety mechanism: the providers array and the shell import are matched by the shape the
@@ -13,13 +39,16 @@ function composePlugin(source, amendment, importPath) {
     if (source.includes(amendment.symbol)) {
         return { source, composed: true };
     }
-    const providers = PROVIDERS.exec(source);
     const shellImport = SHELL_IMPORT.exec(source);
-    if (!providers || !shellImport) {
+    if (!shellImport || !providersBlock(source)) {
+        return { source, composed: false };
+    }
+    const withImports = source.replace(SHELL_IMPORT, () => `import {${withShellSymbols(shellImport[1])}} from '@loomweaver/shell';\nimport { ${amendment.symbol} } from '${importPath}';`);
+    const block = providersBlock(withImports);
+    if (!block) {
         return { source, composed: false };
     }
-    const withImports = source.replace(SHELL_IMPORT, `import {${withShellSymbols(shellImport[1])}} from '@loomweaver/shell';\nimport { ${amendment.symbol} } from '${importPath}';`);
-    const indent = `${providers[4]}  `;
+    const indent = `${block.indent}  `;
     const lines = [
         `${indent}provideTranslationNamespaces('${amendment.id}'),`,
         `${indent}provideCapabilityGrants({ ${amendment.id}: [${amendment.capabilities
@@ -28,7 +57,7 @@ function composePlugin(source, amendment, importPath) {
         `${indent}...providePlugins(${amendment.symbol}),`,
     ].join('\n');
     return {
-        source: withImports.replace(PROVIDERS, (_all, head, body, tail) => `${head}${body}\n${lines}${tail}`),
+        source: `${withImports.slice(0, block.insertAt)}\n${lines}${withImports.slice(block.insertAt)}`,
         composed: true,
     };
 }
@@ -53,12 +82,12 @@ function withShellSymbols(existing) {
         .split(',')
         .map((symbol) => symbol.trim())
         .filter(Boolean);
-    const missing = wanted.filter((symbol) => !present.some((entry) => entry.replace(/^type\s+/, '') === symbol));
+    const missing = wanted.filter((symbol) => present.every((entry) => entry.replace(/^type\s+/, '') !== symbol));
     if (missing.length === 0) {
         return existing;
     }
     const multiline = existing.includes('\n');
-    const all = [...present, ...missing].sort((a, b) => a.localeCompare(b));
+    const all = [...present, ...missing].toSorted((a, b) => a.localeCompare(b));
     return multiline ? `\n  ${all.join(',\n  ')},\n` : ` ${all.join(', ')} `;
 }
 //# sourceMappingURL=compose.js.map

package/src/lib/amend/compose.js.map

@@ -1 +1 @@
-{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/amend/compose.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/amend/compose.ts"],"names":[],"mappings":"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"}

package/src/lib/amend/merge.d.ts

@@ -7,6 +7,7 @@ export interface MergeResult {
     /** What could not be added because the consumer's value occupies the place it would go. */
     readonly declined: readonly string[];
 }
+export declare function normalizeProjectRoot(value: string): string;
 export declare function joinProjectPath(projectRoot: string, path: string): string;
 export declare function resolveAssetInput(glob: AssetGlob, projectRoot: string): string;
 export declare function ensurePostcssPlugin(existing: unknown, amendment: PostcssAmendment): MergeResult;

package/src/lib/amend/merge.js

@@ -1,12 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeProjectRoot = normalizeProjectRoot;
 exports.joinProjectPath = joinProjectPath;
 exports.resolveAssetInput = resolveAssetInput;
 exports.ensurePostcssPlugin = ensurePostcssPlugin;
 exports.ensureBuildTarget = ensureBuildTarget;
 exports.ensureStylesheetSource = ensureStylesheetSource;
+function normalizeProjectRoot(value) {
+    const rooted = value.replace(/^\.?\/*/, '');
+    let end = rooted.length;
+    while (end > 0 && rooted[end - 1] === '/') {
+        end -= 1;
+    }
+    return rooted.slice(0, end);
+}
 function joinProjectPath(projectRoot, path) {
-    const root = projectRoot.replace(/^\.?\/*/, '').replace(/\/+$/, '');
+    const root = normalizeProjectRoot(projectRoot);
     return root ? `${root}/${path}` : path;
 }
 function resolveAssetInput(glob, projectRoot) {
@@ -15,8 +24,7 @@ function resolveAssetInput(glob, projectRoot) {
         : glob.input;
 }
 function ensurePostcssPlugin(existing, amendment) {
-    var _a;
-    const root = (_a = asObject(existing)) !== null && _a !== void 0 ? _a : {};
+    const root = asObject(existing) ?? {};
     const plugins = asObject(root['plugins']);
     if (plugins === undefined && root['plugins'] !== undefined) {
         return {
@@ -25,23 +33,22 @@ function ensurePostcssPlugin(existing, amendment) {
             declined: [`${amendment.file}: "plugins" is not an object`],
         };
     }
-    const next = Object.assign({}, (plugins !== null && plugins !== void 0 ? plugins : {}));
-    if (amendment.plugin in next) {
+    const next = { ...plugins };
+    if (Object.hasOwn(next, amendment.plugin)) {
         return { value: root, added: [], declined: [] };
     }
     next[amendment.plugin] = {};
     return {
-        value: Object.assign(Object.assign({}, root), { plugins: next }),
+        value: { ...root, plugins: next },
         added: [`${amendment.file}: ${amendment.plugin}`],
         declined: [],
     };
 }
 function ensureBuildTarget(target, amendment, projectRoot) {
-    var _a, _b, _c, _d;
-    const next = Object.assign({}, ((_a = asObject(target)) !== null && _a !== void 0 ? _a : {}));
+    const next = { ...asObject(target) };
     const added = [];
     const declined = [];
-    const options = Object.assign({}, ((_b = asObject(next['options'])) !== null && _b !== void 0 ? _b : {}));
+    const options = { ...asObject(next['options']) };
     const styles = ensureStrings(options['styles'], amendment.styles.map((style) => joinProjectPath(projectRoot, style)));
     if (styles.added.length > 0) {
         options['styles'] = styles.value;
@@ -54,8 +61,8 @@ function ensureBuildTarget(target, amendment, projectRoot) {
     }
     next['options'] = options;
     if (amendment.inlineCritical !== undefined || amendment.serviceWorker) {
-        const configurations = Object.assign({}, ((_c = asObject(next['configurations'])) !== null && _c !== void 0 ? _c : {}));
-        const production = Object.assign({}, ((_d = asObject(configurations['production'])) !== null && _d !== void 0 ? _d : {}));
+        const configurations = { ...asObject(next['configurations']) };
+        const production = { ...asObject(configurations['production']) };
         if (amendment.serviceWorker && production['serviceWorker'] === undefined) {
             production['serviceWorker'] = joinProjectPath(projectRoot, amendment.serviceWorker);
             added.push(`production serviceWorker: ${production['serviceWorker']}`);
@@ -78,27 +85,26 @@ function ensureBuildTarget(target, amendment, projectRoot) {
     return { value: next, added, declined };
 }
 function ensureStylesheetSource(css, source) {
-    const quoted = source.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    if (new RegExp(`@source\\s+['"]${quoted}/?['"]`).test(css)) {
+    const quoted = source.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw `\$&`);
+    if (new RegExp(String.raw `@source\s+['"]${quoted}/?['"]`).test(css)) {
         return css;
     }
     return `${css.trimEnd()}\n\n@source '${source}';\n`;
 }
 function ensureInlineCritical(optimization, inlineCritical) {
-    var _a;
     if (typeof optimization === 'boolean') {
         return { value: optimization, changed: false, declined: true };
     }
-    const root = Object.assign({}, ((_a = asObject(optimization)) !== null && _a !== void 0 ? _a : {}));
+    const root = { ...asObject(optimization) };
     const styles = asObject(root['styles']);
     if (styles === undefined && root['styles'] !== undefined) {
         return { value: optimization, changed: false, declined: true };
     }
-    if ((styles === null || styles === void 0 ? void 0 : styles['inlineCritical']) !== undefined) {
+    if (styles?.['inlineCritical'] !== undefined) {
         return { value: optimization, changed: false, declined: false };
     }
     return {
-        value: Object.assign(Object.assign({}, root), { styles: Object.assign(Object.assign({}, (styles !== null && styles !== void 0 ? styles : {})), { inlineCritical }) }),
+        value: { ...root, styles: { ...styles, inlineCritical } },
         changed: true,
         declined: false,
     };
@@ -107,10 +113,11 @@ function ensureStrings(existing, wanted) {
     const list = Array.isArray(existing) ? [...existing] : [];
     const added = [];
     for (const entry of wanted) {
-        if (!list.includes(entry)) {
-            list.push(entry);
-            added.push(entry);
+        if (list.includes(entry)) {
+            continue;
         }
+        list.push(entry);
+        added.push(entry);
     }
     return { value: list, added };
 }
@@ -122,7 +129,11 @@ function ensureAssets(existing, wanted, projectRoot) {
         if (list.some((entry) => inputOf(entry) === input)) {
             continue;
         }
-        list.push(Object.assign({ glob: glob.glob, input }, (glob.output === undefined ? {} : { output: glob.output })));
+        list.push({
+            glob: glob.glob,
+            input,
+            ...(glob.output !== undefined && { output: glob.output }),
+        });
         added.push(input);
     }
     return { value: list, added };
@@ -132,7 +143,7 @@ function inputOf(entry) {
         return entry;
     }
     const asset = asObject(entry);
-    return typeof (asset === null || asset === void 0 ? void 0 : asset['input']) === 'string' ? asset['input'] : undefined;
+    return typeof asset?.['input'] === 'string' ? asset['input'] : undefined;
 }
 function asObject(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value)

package/src/lib/amend/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/amend/merge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/amend/merge.ts"],"names":[],"mappings":"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"}

package/src/lib/generate/generate.js

@@ -10,14 +10,13 @@ function isUnsafePath(path) {
 }
 function generate(recipe, input) {
     const files = recipe.build(input);
-    const unsafe = Object.keys(files).find(isUnsafePath);
+    const unsafe = Object.keys(files).find((path) => isUnsafePath(path));
     if (unsafe !== undefined) {
         throw new Error(`Recipe "${recipe.id}" produced an unsafe path: "${unsafe}".`);
     }
     return files;
 }
 function amendments(recipe, input) {
-    var _a, _b;
-    return (_b = (_a = recipe.amend) === null || _a === void 0 ? void 0 : _a.call(recipe, input)) !== null && _b !== void 0 ? _b : [];
+    return recipe.amend?.(input) ?? [];
 }
 //# sourceMappingURL=generate.js.map

package/src/lib/generate/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/generate/generate.ts"],"names":[],"mappings":";;AAYA,4BAOC;AAED,gCAKC;AAvBD,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,CAAC;QACjB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QACnB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC/B,CAAC;AACJ,CAAC;AAED,SAAgB,QAAQ,CAAQ,MAAqB,EAAE,KAAY;IACjE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACrD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,WAAW,MAAM,CAAC,EAAE,+BAA+B,MAAM,IAAI,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,UAAU,CACxB,MAAqB,EACrB,KAAY;;IAEZ,OAAO,MAAA,MAAA,MAAM,CAAC,KAAK,uDAAG,KAAK,CAAC,mCAAI,EAAE,CAAC;AACrC,CAAC"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/generate/generate.ts"],"names":[],"mappings":";;AAYA,4BAOC;AAED,gCAKC;AAvBD,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,CACL,IAAI,CAAC,MAAM,KAAK,CAAC;QACjB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QACnB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC/B,CAAC;AACJ,CAAC;AAED,SAAgB,QAAQ,CAAQ,MAAqB,EAAE,KAAY;IACjE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IACrE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,WAAW,MAAM,CAAC,EAAE,+BAA+B,MAAM,IAAI,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,UAAU,CACxB,MAAqB,EACrB,KAAY;IAEZ,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;AACrC,CAAC"}

package/src/lib/scaffolds/inputs.js

@@ -4,9 +4,8 @@ exports.weaverInput = weaverInput;
 exports.distributionInput = distributionInput;
 const scaffolds_1 = require("./scaffolds");
 function weaverInput(values) {
-    var _a;
     return {
-        id: (_a = (0, scaffolds_1.str)(values, 'id')) !== null && _a !== void 0 ? _a : '',
+        id: (0, scaffolds_1.str)(values, 'id') ?? '',
         name: (0, scaffolds_1.str)(values, 'name'),
         prefix: (0, scaffolds_1.str)(values, 'prefix'),
         importPath: (0, scaffolds_1.str)(values, 'importPath'),
@@ -25,12 +24,11 @@ function weaverInput(values) {
     };
 }
 function distributionInput(values) {
-    var _a, _b;
     return {
-        name: (_a = (0, scaffolds_1.str)(values, 'name')) !== null && _a !== void 0 ? _a : '',
+        name: (0, scaffolds_1.str)(values, 'name') ?? '',
         title: (0, scaffolds_1.str)(values, 'title'),
         directory: (0, scaffolds_1.str)(values, 'directory'),
-        styles: (_b = (0, scaffolds_1.str)(values, 'styles')) !== null && _b !== void 0 ? _b : 'tailwind',
+        styles: (0, scaffolds_1.str)(values, 'styles') ?? 'tailwind',
     };
 }
 //# sourceMappingURL=inputs.js.map

package/src/lib/scaffolds/inputs.js.map

@@ -1 +1 @@
-{"version":3,"file":"inputs.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/scaffolds/inputs.ts"],"names":[],"mappings":";;AAGA,kCAmBC;AAED,8CAQC;AA/BD,2CAAwD;AAExD,SAAgB,WAAW,CAAC,MAAsB;;IAChD,OAAO;QACL,EAAE,EAAE,MAAA,IAAA,eAAG,EAAC,MAAM,EAAE,IAAI,CAAC,mCAAI,EAAE;QAC3B,IAAI,EAAE,IAAA,eAAG,EAAC,MAAM,EAAE,MAAM,CAAC;QACzB,MAAM,EAAE,IAAA,eAAG,EAAC,MAAM,EAAE,QAAQ,CAAC;QAC7B,UAAU,EAAE,IAAA,eAAG,EAAC,MAAM,EAAE,YAAY,CAAC;QACrC,QAAQ,EAAE;YACR,OAAO,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,SAAS,CAAC;YAChC,QAAQ,EAAE,IAAA,eAAG,EAAC,MAAM,EAAE,UAAU,CAAC;YACjC,IAAI,EAAE,IAAA,eAAG,EAAC,MAAM,EAAE,MAAM,CAAC;YACzB,OAAO,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,SAAS,CAAC;YAChC,QAAQ,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,UAAU,CAAC;YAClC,KAAK,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,OAAO,CAAC;YAC5B,YAAY,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,cAAc,CAAC;YAC1C,SAAS,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,WAAW,CAAC;YACpC,MAAM,EAAE,IAAA,eAAG,EAAC,MAAM,EAAE,QAAQ,CAAC;YAC7B,IAAI,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,MAAM,CAAC;SAC3B;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,iBAAiB,CAAC,MAAsB;;IACtD,OAAO;QACL,IAAI,EAAE,MAAA,IAAA,eAAG,EAAC,MAAM,EAAE,MAAM,CAAC,mCAAI,EAAE;QAC/B,KAAK,EAAE,IAAA,eAAG,EAAC,MAAM,EAAE,OAAO,CAAC;QAC3B,SAAS,EAAE,IAAA,eAAG,EAAC,MAAM,EAAE,WAAW,CAAC;QACnC,MAAM,EACJ,MAAC,IAAA,eAAG,EAAC,MAAM,EAAE,QAAQ,CAAoC,mCAAI,UAAU;KAC1E,CAAC;AACJ,CAAC"}
+{"version":3,"file":"inputs.js","sourceRoot":"","sources":["../../../../../../../libs/tooling/devkit/src/lib/scaffolds/inputs.ts"],"names":[],"mappings":";;AAGA,kCAmBC;AAED,8CAQC;AA/BD,2CAAmE;AAEnE,SAAgB,WAAW,CAAC,MAAsB;IAChD,OAAO;QACL,EAAE,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE;QAC/B,IAAI,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,MAAM,CAAC;QAC7B,MAAM,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,QAAQ,CAAC;QACjC,UAAU,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,YAAY,CAAC;QACzC,QAAQ,EAAE;YACR,OAAO,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,SAAS,CAAC;YAChC,QAAQ,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,UAAU,CAAC;YACrC,IAAI,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,MAAM,CAAC;YAC7B,OAAO,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,SAAS,CAAC;YAChC,QAAQ,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,UAAU,CAAC;YAClC,KAAK,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,OAAO,CAAC;YAC5B,YAAY,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,cAAc,CAAC;YAC1C,SAAS,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,WAAW,CAAC;YACpC,MAAM,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,QAAQ,CAAC;YACjC,IAAI,EAAE,IAAA,gBAAI,EAAC,MAAM,EAAE,MAAM,CAAC;SAC3B;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,iBAAiB,CAAC,MAAsB;IACtD,OAAO;QACL,IAAI,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;QACnC,KAAK,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,OAAO,CAAC;QAC/B,SAAS,EAAE,IAAA,eAAO,EAAC,MAAM,EAAE,WAAW,CAAC;QACvC,MAAM,EACH,IAAA,eAAO,EAAC,MAAM,EAAE,QAAQ,CAAoC,IAAI,UAAU;KAC9E,CAAC;AACJ,CAAC"}