@solidstarters/solid-code-builder 1.0.29 → 1.0.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -78,15 +78,13 @@ function refreshModel(options) {
|
|
|
78
78
|
const modulePath = (options.module === helpers_1.SOLID_CORE_MODULE_NAME) ? `src` : `src/${options.module}`;
|
|
79
79
|
// If the model related code is not present, then add it by call addModel, else call update field with the fields provided
|
|
80
80
|
const modelEntityFilePath = `${modulePath}/entities/${(0, strings_1.dasherize)(options.model)}.entity.ts`;
|
|
81
|
-
|
|
81
|
+
const rules = [];
|
|
82
82
|
if (!tree.exists(modelEntityFilePath)) {
|
|
83
|
-
|
|
84
|
-
return addModel(options)(tree, _context);
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
// console.log('Model does not exist, updating fields');
|
|
88
|
-
return updateFields(options)(tree, _context);
|
|
83
|
+
rules.push(addModel(options));
|
|
89
84
|
}
|
|
85
|
+
// Always call update fields to ensure the formatting and other aspects are updated
|
|
86
|
+
rules.push(updateFields(options));
|
|
87
|
+
return (0, schematics_1.chain)(rules)(tree, _context);
|
|
90
88
|
};
|
|
91
89
|
}
|
|
92
90
|
function addModel(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/code-builder/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwBA,8BAwBC;AAED,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/code-builder/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -54,15 +54,13 @@ export function refreshModel(options: any): Rule {
|
|
|
54
54
|
|
|
55
55
|
// If the model related code is not present, then add it by call addModel, else call update field with the fields provided
|
|
56
56
|
const modelEntityFilePath = `${modulePath}/entities/${dasherize(options.model)}.entity.ts`;
|
|
57
|
-
|
|
57
|
+
const rules : Rule[] = [];
|
|
58
58
|
if (!tree.exists(modelEntityFilePath)) {
|
|
59
|
-
|
|
60
|
-
return addModel(options)(tree, _context);
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
63
|
-
// console.log('Model does not exist, updating fields');
|
|
64
|
-
return updateFields(options)(tree, _context);
|
|
59
|
+
rules.push(addModel(options));
|
|
65
60
|
}
|
|
61
|
+
// Always call update fields to ensure the formatting and other aspects are updated
|
|
62
|
+
rules.push(updateFields(options));
|
|
63
|
+
return chain(rules)(tree, _context);
|
|
66
64
|
};
|
|
67
65
|
}
|
|
68
66
|
|