@solidstarters/solid-code-builder 1.0.20 → 1.0.21

package/dist/code-builder/lib/field/decorator-managers/dto/ApiPropertyDecoratorManager.d.ts

@@ -17,8 +17,12 @@ export declare class ApiPropertyDecoratorManager implements DecoratorManager {
     decoratorImports(): Change[];
     updateDecorator(): [PropertyDeclaration, Change[]];
     createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator;
+    private createDecoratorArguments;
+    private existingDecoratorOptions;
     private findDecorator;
     private filterOtherDecorators;
     private filterNonDecorators;
     private containsIdentifierName;
+    private buildApiPropertyDecoratorOptions;
+    private buildApiPropertyOptionsCode;
 }

package/dist/code-builder/lib/field/decorator-managers/dto/ApiPropertyDecoratorManager.js

@@ -20,7 +20,7 @@ class ApiPropertyDecoratorManager {
     buildDecorator() {
         const fieldSourceLines = [];
         const changes = [];
-        fieldSourceLines.push(`@${this.decoratorName()}()`);
+        fieldSourceLines.push(`@${this.decoratorName()}(${this.buildApiPropertyOptionsCode()})`);
         changes.push(...this.decoratorImports());
         return {
             filePath: this.options.source.fileName,
@@ -58,6 +58,7 @@ class ApiPropertyDecoratorManager {
         return [updatedProperty, changes];
     }
     createDecorator(existingDecorator) {
+        var _a;
         // Capture the existing validation options
         let validationOptions = [];
         if (existingDecorator !== undefined) {
@@ -72,9 +73,18 @@ class ApiPropertyDecoratorManager {
                 validationOptions.push(...existingObjectLiteralExpression.properties);
             }
         }
+        const existingOptions = this.existingDecoratorOptions(existingDecorator);
+        const newOptions = [];
+        if (this.options.field.description) {
+            newOptions.push(typescript_1.default.factory.createPropertyAssignment('description', typescript_1.default.factory.createStringLiteral((_a = this.options.field) === null || _a === void 0 ? void 0 : _a.description)));
+        }
+        const mergedOptions = [
+            ...existingOptions.filter((option) => !(typescript_1.default.isPropertyAssignment(option) && option.name.getText() === 'description')),
+            ...newOptions,
+        ];
         // Re-create the column decorator with the merged column decorator options
         const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
-        const argumentsArray = [];
+        const argumentsArray = this.createDecoratorArguments(mergedOptions);
         // const length = ts.factory.createNumericLiteral(this.options.length);
         // argumentsArray.push(length);
         if (validationOptions.length > 0) {
@@ -84,6 +94,28 @@ class ApiPropertyDecoratorManager {
         const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
         return typescript_1.default.factory.createDecorator(call);
     }
+    createDecoratorArguments(options) {
+        const argumentsArray = [];
+        if (options.length > 0) {
+            const optionsObjectLiteral = typescript_1.default.factory.createObjectLiteralExpression(options);
+            argumentsArray.push(optionsObjectLiteral);
+        }
+        return argumentsArray;
+    }
+    existingDecoratorOptions(existingDecorator) {
+        const options = [];
+        if (existingDecorator) {
+            const existingCallExpression = existingDecorator.expression;
+            if (existingCallExpression.arguments.length > 0) {
+                const firstArgument = existingCallExpression.arguments[0];
+                if (!typescript_1.default.isObjectLiteralExpression(firstArgument)) {
+                    throw new Error('Api Property decorator 1st argument must be an object literal');
+                }
+                options.push(...firstArgument.properties);
+            }
+        }
+        return options;
+    }
     findDecorator(name, existingModifiers) {
         return existingModifiers ? existingModifiers.filter((m) => (m.kind === typescript_1.default.SyntaxKind.Decorator)).map(m => m).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
     }
@@ -98,6 +130,33 @@ class ApiPropertyDecoratorManager {
         const identifier = callExpression.expression;
         return identifier.text === identifierName;
     }
+    buildApiPropertyDecoratorOptions() {
+        var _a;
+        const options = new Map();
+        if (this.options.field.description) {
+            options.set('description', (_a = this.options.field) === null || _a === void 0 ? void 0 : _a.description);
+        }
+        return options;
+    }
+    buildApiPropertyOptionsCode() {
+        const options = this.buildApiPropertyDecoratorOptions();
+        const keys = Array.from(options.keys());
+        if (keys.length === 0) {
+            return '';
+        }
+        const optionsString = keys
+            .filter((key) => options.get(key) !== null)
+            .map((key) => {
+            if (typeof options.get(key) === 'string') {
+                return `${key}: "${options.get(key)}"`;
+            }
+            else {
+                return `${key}: ${options.get(key)}`;
+            }
+        })
+            .join(', ');
+        return `{ ${optionsString} }`;
+    }
 }
 exports.ApiPropertyDecoratorManager = ApiPropertyDecoratorManager;
 //# sourceMappingURL=ApiPropertyDecoratorManager.js.map

package/dist/code-builder/lib/field/decorator-managers/dto/ApiPropertyDecoratorManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApiPropertyDecoratorManager.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/decorator-managers/dto/ApiPropertyDecoratorManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ApiPropertyDecoratorManager.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/decorator-managers/dto/ApiPropertyDecoratorManager.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-code-builder",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "This package is use to generate code for the @solidstarters projects",
   "private": false,
   "publishConfig": {
@@ -12,7 +12,10 @@
     "test": "npm run build && jasmine src/**/*_spec.js",
     "postbuild": "copyfiles './files/**/*' dist/",
     "clean": "rimraf dist",
-    "prepare": "npm run build"
+    "prepare": "npm run build",
+    "publish:patch": "node publish.js patch",
+    "publish:minor": "node publish.js minor",
+    "publish:major": "node publish.js major"
   },
   "keywords": [
     "schematics"

package/publish.js

@@ -0,0 +1,16 @@
+const { execSync } = require("child_process");
+
+const versionType = process.argv[2] || "patch"; // Default to patch if not specified
+
+try {
+  console.log(`🔄 Updating package version (${versionType})...`);
+  execSync(`npm version ${versionType}`, { stdio: "inherit" });
+
+  console.log("📦 Publishing package...");
+  execSync("npm publish", { stdio: "inherit" });
+
+  console.log("✅ Published successfully!");
+} catch (error) {
+  console.error("❌ Error:", error.message);
+  process.exit(1);
+}

package/src/code-builder/lib/field/decorator-managers/dto/ApiPropertyDecoratorManager.ts

@@ -22,7 +22,7 @@ export class ApiPropertyDecoratorManager implements DecoratorManager {
   buildDecorator(): PartialAddFieldChange {
     const fieldSourceLines = [];
     const changes: Change[] = [];
-    fieldSourceLines.push(`@${this.decoratorName()}()`);
+    fieldSourceLines.push(`@${this.decoratorName()}(${this.buildApiPropertyOptionsCode()})`);
     changes.push(...this.decoratorImports());
     return {
       filePath: this.options.source.fileName,
@@ -92,9 +92,27 @@ export class ApiPropertyDecoratorManager implements DecoratorManager {
       }
     }
 
+    const existingOptions: ts.ObjectLiteralElementLike[] = this.existingDecoratorOptions(existingDecorator);
+    
+    const newOptions: ts.ObjectLiteralElementLike[] = [];
+    if (this.options.field.description) {
+      newOptions.push(
+        ts.factory.createPropertyAssignment(
+            'description',
+            ts.factory.createStringLiteral(this.options.field?.description)
+        )
+      );
+    }
+    const mergedOptions = [
+      ...existingOptions.filter(
+          (option) => !(ts.isPropertyAssignment(option) && option.name.getText() === 'description')
+      ),
+      ...newOptions,
+    ];
+
     // Re-create the column decorator with the merged column decorator options
     const decoratorIdentifier = ts.factory.createIdentifier(this.decoratorName());
-    const argumentsArray: ts.Expression[] = [];
+    const argumentsArray: ts.Expression[] = this.createDecoratorArguments(mergedOptions);
     // const length = ts.factory.createNumericLiteral(this.options.length);
     // argumentsArray.push(length);
     if (validationOptions.length > 0) {
@@ -106,6 +124,30 @@ export class ApiPropertyDecoratorManager implements DecoratorManager {
 
   }
 
+  private createDecoratorArguments(options: ts.ObjectLiteralElementLike[]) {
+    const argumentsArray: ts.Expression[] = [];
+    if (options.length > 0) {
+        const optionsObjectLiteral = ts.factory.createObjectLiteralExpression(options);
+        argumentsArray.push(optionsObjectLiteral);
+    }
+    return argumentsArray;
+  }
+
+  private existingDecoratorOptions(existingDecorator: ts.Decorator | undefined): ts.ObjectLiteralElementLike[] {
+      const options: ts.ObjectLiteralElementLike[] = [];
+      if (existingDecorator) {
+          const existingCallExpression = existingDecorator.expression as ts.CallExpression;
+          if (existingCallExpression.arguments.length > 0) {
+              const firstArgument = existingCallExpression.arguments[0];
+              if (!ts.isObjectLiteralExpression(firstArgument)) {
+                  throw new Error('Api Property decorator 1st argument must be an object literal');
+              }
+              options.push(...firstArgument.properties);
+          }
+      }
+      return options;
+  }
+
   private findDecorator(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator | undefined {
     return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
   }
@@ -124,4 +166,31 @@ export class ApiPropertyDecoratorManager implements DecoratorManager {
     return identifier.text === identifierName;
   }
 
+  private buildApiPropertyDecoratorOptions(): Map<string, any> { 
+    const options: Map<string, any> = new Map<string, any>();
+    if (this.options.field.description) {
+      options.set('description', this.options.field?.description);
+    }
+    return options;
+  }
+
+  private buildApiPropertyOptionsCode(): string {
+    const options = this.buildApiPropertyDecoratorOptions();
+    const keys = Array.from(options.keys());
+    if (keys.length === 0) {
+      return '';
+    }
+    const optionsString = keys
+      .filter((key) => options.get(key) !== null)
+      .map((key) => {
+          if (typeof options.get(key) === 'string') {
+              return `${key}: "${options.get(key)}"`;
+          } else {
+              return `${key}: ${options.get(key)}`;
+          }
+      })
+      .join(', ');
+    return `{ ${optionsString} }`;
+  }
+
 }

package/dto_additional_fields_duplicate_fix.diff

@@ -1,40 +0,0 @@
-diff --git a/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.ts b/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.ts
-index 7809d32..3ca4f0b 100644
---- a/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.ts
-+++ b/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.ts
-@@ -88,7 +88,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
- 
-   removeField(): FieldChange[] {
-     const fieldChanges: FieldChange[] = [];
--    console.log(`Dto removeField ${this.fieldName()} called ...`);
-+    console.log(`${this.options.sourceType} Dto removeField ${this.fieldName()} called ...`);
-     fieldChanges.push(this.removeFieldFor(this.fieldName(), this.source));
-     if (this.isAdditionalFieldRequired()) {
-       fieldChanges.push(...this.removeAdditionalField());
-@@ -288,7 +288,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
-   updateField(): FieldChange[] {
-     const fieldChanges: FieldChange[] = [];
- 
--    console.log(`\ncreate Dto updateField ${this.fieldName()} called ...`);
-+    console.log(`\n${this.options.sourceType} Dto updateField ${this.fieldName()} called ...`);
- 
-     const fieldName = this.fieldName();
-     const fieldType = this.fieldType().node(this.field);
-@@ -307,11 +307,13 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
-       // Get the related field property declaration node
-       fieldChanges.push(...this.addOrUpdateAdditionalField()); // TODO This needs to be refactored and renamed to updateAdditionalField, since it is confusing
-     }
--    else {
--      // fieldChanges.push(this.removeAdditionalField()); //FIXME temporary fix, to check update module command
--    }
- 
--    return fieldChanges;
-+    // Since updateFieldInternal updates the class node, and additional field updates are done on the updated class node, need to only use the latest field change
-+    const latestFieldChange = fieldChanges.pop();
-+    if (!latestFieldChange) {
-+      throw new Error(`Field change not found for field ${this.fieldName()}`);
-+    }
-+    return [latestFieldChange];
-   }
- 
-   protected addAdditionalField(): FieldChange[] {

package/src/code-builder/index.js

@@ -1,178 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateChecksum = exports.showAST = exports.removeFields = exports.updateFields = exports.addFields = exports.addModel = exports.refreshModel = exports.addModule = void 0;
-const strings_1 = require("@angular-devkit/core/src/utils/strings");
-const schematics_1 = require("@angular-devkit/schematics");
-const generateModelHelpers = __importStar(require("./lib/model/helpers"));
-const helpers_1 = require("./lib/model/helpers");
-const helpers_2 = require("./lib/model/helpers");
-const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
-const generateModelUtils = Object.assign({ dasherize: strings_1.dasherize, classify: strings_1.classify }, generateModelHelpers);
-// You don't have to export the function as default. You can also have more than one rule factory
-// per file.
-function addModule(options) {
-    return (_tree, _context) => {
-        //Link to nestjs schematic
-        return (0, schematics_1.chain)([
-            (0, schematics_1.externalSchematic)('@nestjs/schematics', 'module', {
-                name: options === null || options === void 0 ? void 0 : options.module,
-            }),
-            updateChecksum(options === null || options === void 0 ? void 0 : options.module, options === null || options === void 0 ? void 0 : options.generateChecksum, ...generateModelHelpers.getSourceFilePathsAffected(generateModelHelpers.Command.AddModule, options)),
-        ]);
-    };
-}
-exports.addModule = addModule;
-function refreshModel(options) {
-    return (tree, _context) => {
-        // If the model related code is not present, then add it by call addModel, else call update field with the fields provided
-        const modelEntityFilePath = `src/${options.module}/entities/${(0, strings_1.dasherize)(options.model)}.entity.ts`;
-        // console.log('Model Entity File Path: ', modelEntityFilePath);
-        if (!tree.exists(modelEntityFilePath)) {
-            // console.log('Model does not exist, adding model');
-            return addModel(options)(tree, _context);
-        }
-        else {
-            // console.log('Model does not exist, updating fields');
-            return updateFields(options)(tree, _context);
-        }
-    };
-}
-exports.refreshModel = refreshModel;
-function addModel(options) {
-    return (tree, context) => {
-        //Link to a templates folder
-        const sourceTemplates = (0, schematics_1.apply)((0, schematics_1.url)('../../files/generate-model'), [
-            (0, schematics_1.template)(Object.assign(Object.assign({}, generateModelUtils), options)),
-            (0, schematics_1.move)(`src/${options.module}`),
-        ]);
-        return (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
-            addModuleImportsAndMetadata(options),
-            (0, schematics_1.mergeWith)(sourceTemplates, schematics_1.MergeStrategy.Overwrite),
-            updateChecksum(options === null || options === void 0 ? void 0 : options.module, options === null || options === void 0 ? void 0 : options.generateChecksum, ...generateModelHelpers.getSourceFilePathsAffected(generateModelHelpers.Command.AddModel, options)),
-            addFields(options),
-            // removeFields(options),
-        ]))(tree, context);
-    };
-}
-exports.addModel = addModel;
-function normalizeFieldType(fields) {
-    // if field is a string, convert it to an array
-    if (typeof fields === 'string') {
-        fields = [fields];
-    }
-    return fields;
-}
-function addFields(options) {
-    return (tree, _context) => {
-        const normalizedFields = normalizeFieldType(options.fields);
-        const fields = normalizedFields.map((f) => JSON.parse(f));
-        fields.forEach((field) => {
-            (0, helpers_1.addField)(tree, options, field);
-        });
-        return tree;
-    };
-}
-exports.addFields = addFields;
-function updateFields(options) {
-    return (tree, _context) => {
-        const normalizedFields = normalizeFieldType(options.fields);
-        const fields = normalizedFields.map((f) => JSON.parse(f));
-        (options === null || options === void 0 ? void 0 : options.generateChecksum) ? generateModelHelpers.takeBackupIfChecksumsMismatch(tree, options.module) : "no-ops";
-        fields.forEach((field) => {
-            generateModelHelpers.updateField(tree, options, field);
-        });
-        return tree;
-    };
-}
-exports.updateFields = updateFields;
-function removeFields(options) {
-    return (tree, _context) => {
-        const normalizedFields = normalizeFieldType(options.fields);
-        const fields = normalizedFields.map((f) => JSON.parse(f));
-        (options === null || options === void 0 ? void 0 : options.generateChecksum) ? generateModelHelpers.takeBackupIfChecksumsMismatch(tree, options.module) : "no-ops";
-        fields.forEach((field) => {
-            (0, helpers_2.removeField)(tree, options, field);
-        });
-        return tree;
-    };
-}
-exports.removeFields = removeFields;
-function addModuleImportsAndMetadata(options) {
-    return (tree, _context) => {
-        // Handle the module imports
-        const moduleFilePath = `src/${(0, strings_1.dasherize)(options.module)}/${(0, strings_1.dasherize)(options.module)}.module.ts`;
-        const moduleImports = [
-            { symbolName: `TypeOrmModule`, importPath: `@nestjs/typeorm` },
-            generateModelHelpers.getSolidImports(options.model, generateModelHelpers.SolidProviderType.Entity),
-            generateModelHelpers.getSolidImports(options.model, generateModelHelpers.SolidProviderType.Service),
-            generateModelHelpers.getSolidImports(options.model, generateModelHelpers.SolidProviderType.Controller),
-        ];
-        generateModelHelpers.addImports(tree, moduleFilePath, moduleImports);
-        // Handle the module metadata
-        const moduleMetadata = [
-            generateModelHelpers.getModuleMetadata(options.model, generateModelHelpers.ModuleMetadataType.TypeOrmImports),
-            generateModelHelpers.getModuleMetadata(options.model, generateModelHelpers.ModuleMetadataType.Controllers),
-            generateModelHelpers.getModuleMetadata(options.model, generateModelHelpers.ModuleMetadataType.Providers),
-        ];
-        generateModelHelpers.addModuleMetadata(tree, moduleFilePath, moduleMetadata);
-        return tree;
-    };
-}
-function showAST(options) {
-    return (tree, _context) => {
-        showASTinfo(tree, options.name);
-        return tree;
-    };
-}
-exports.showAST = showAST;
-function showASTinfo(tree, filePath) {
-    //Show the source tree of the target file
-    const sourceNode = typescript_1.default.createSourceFile(filePath, tree.readText(filePath), typescript_1.default.ScriptTarget.ES2015, true);
-    showTree(sourceNode);
-}
-function showTree(sourceNode) {
-    function printAllChildren(node, depth) {
-        console.log(`${depth}.`.repeat(depth), typescript_1.default.SyntaxKind[node.kind]);
-        if (node.getChildCount() === 0) {
-            console.log(`${depth}.`.repeat(depth) + ' Text: ' + node.getText());
-        }
-        node.getChildren().forEach(child => printAllChildren(child, depth + 1));
-    }
-    printAllChildren(sourceNode, 0);
-}
-function updateChecksum(moduleName, generateChecksum = false, ...filePaths) {
-    return (tree, _context) => {
-        if (!generateChecksum) {
-            return tree;
-        }
-        return generateModelHelpers.handleUpdateChecksums(tree, moduleName, ...filePaths);
-    };
-}
-exports.updateChecksum = updateChecksum;
-//# sourceMappingURL=index.js.map

package/src/code-builder/index_spec.js

@@ -1,46 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const schematics_1 = require("@angular-devkit/schematics");
-const testing_1 = require("@angular-devkit/schematics/testing");
-const path = __importStar(require("path"));
-const collectionPath = path.join(__dirname, '../collection.json');
-describe('code-builder', () => {
-    it('works', () => __awaiter(void 0, void 0, void 0, function* () {
-        const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
-        const tree = yield runner.runSchematic('code-builder', {}, schematics_1.Tree.empty());
-        expect(tree.files).toEqual([]);
-    }));
-});
-//# sourceMappingURL=index_spec.js.map