@ngrx/entity 7.3.0 → 7.4.0
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.
- package/bundles/entity.umd.js +4 -4
- package/bundles/entity.umd.min.js +2 -2
- package/bundles/entity.umd.min.js.map +1 -1
- package/esm2015/entity.js +0 -1
- package/esm2015/index.js +1 -2
- package/esm2015/public_api.js +1 -2
- package/esm2015/src/create_adapter.js +7 -4
- package/esm2015/src/entity_state.js +2 -3
- package/esm2015/src/index.js +1 -2
- package/esm2015/src/models.js +161 -94
- package/esm2015/src/sorted_state_adapter.js +38 -14
- package/esm2015/src/state_adapter.js +11 -6
- package/esm2015/src/state_selectors.js +27 -7
- package/esm2015/src/unsorted_state_adapter.js +49 -15
- package/esm2015/src/utils.js +2 -3
- package/esm5/entity.js +0 -1
- package/esm5/index.js +0 -1
- package/esm5/public_api.js +0 -1
- package/esm5/src/create_adapter.js +0 -1
- package/esm5/src/entity_state.js +0 -1
- package/esm5/src/index.js +0 -1
- package/esm5/src/models.js +0 -1
- package/esm5/src/sorted_state_adapter.js +0 -1
- package/esm5/src/state_adapter.js +0 -1
- package/esm5/src/state_selectors.js +0 -1
- package/esm5/src/unsorted_state_adapter.js +0 -1
- package/esm5/src/utils.js +0 -1
- package/fesm2015/entity.js +137 -42
- package/fesm2015/entity.js.map +1 -1
- package/fesm5/entity.js +1 -1
- package/migrations/6_0_0/index.js +2 -2
- package/package.json +2 -2
- package/schematics/ng-add/index.js +6 -6
- package/schematics-core/index.d.ts +1 -2
- package/schematics-core/index.js +4 -5
- package/schematics-core/utility/ast-utils.d.ts +10 -0
- package/schematics-core/utility/ast-utils.js +153 -154
- package/schematics-core/utility/change.js +39 -46
- package/schematics-core/utility/config.js +8 -8
- package/schematics-core/utility/find-module.js +22 -22
- package/schematics-core/utility/ngrx-utils.d.ts +2 -0
- package/schematics-core/utility/ngrx-utils.js +83 -142
- package/schematics-core/utility/package.js +3 -3
- package/schematics-core/utility/parse-name.js +4 -4
- package/schematics-core/utility/project.js +11 -8
- package/schematics-core/utility/strings.d.ts +12 -0
- package/schematics-core/utility/strings.js +27 -12
- package/schematics-core/utility/update.js +13 -13
- package/schematics-core/utility/route-utils.d.ts +0 -20
- package/schematics-core/utility/route-utils.js +0 -84
|
@@ -16,11 +16,11 @@
|
|
|
16
16
|
* Use of this source code is governed by an MIT-style license that can be
|
|
17
17
|
* found in the LICENSE file at https://angular.io/license
|
|
18
18
|
*/
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
19
|
+
const STRING_DASHERIZE_REGEXP = /[ _]/g;
|
|
20
|
+
const STRING_DECAMELIZE_REGEXP = /([a-z\d])([A-Z])/g;
|
|
21
|
+
const STRING_CAMELIZE_REGEXP = /(-|_|\.|\s)+(.)?/g;
|
|
22
|
+
const STRING_UNDERSCORE_REGEXP_1 = /([a-z\d])([A-Z]+)/g;
|
|
23
|
+
const STRING_UNDERSCORE_REGEXP_2 = /-|\s+/g;
|
|
24
24
|
/**
|
|
25
25
|
* Converts a camelized string into all lower case separated by underscores.
|
|
26
26
|
*
|
|
@@ -62,10 +62,10 @@
|
|
|
62
62
|
*/
|
|
63
63
|
function camelize(str) {
|
|
64
64
|
return str
|
|
65
|
-
.replace(STRING_CAMELIZE_REGEXP,
|
|
65
|
+
.replace(STRING_CAMELIZE_REGEXP, (_match, _separator, chr) => {
|
|
66
66
|
return chr ? chr.toUpperCase() : '';
|
|
67
67
|
})
|
|
68
|
-
.replace(/^([A-Z])/,
|
|
68
|
+
.replace(/^([A-Z])/, (match) => match.toLowerCase());
|
|
69
69
|
}
|
|
70
70
|
exports.camelize = camelize;
|
|
71
71
|
/**
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
function classify(str) {
|
|
82
82
|
return str
|
|
83
83
|
.split('.')
|
|
84
|
-
.map(
|
|
84
|
+
.map(part => capitalize(camelize(part)))
|
|
85
85
|
.join('.');
|
|
86
86
|
}
|
|
87
87
|
exports.classify = classify;
|
|
@@ -117,16 +117,31 @@
|
|
|
117
117
|
return str.charAt(0).toUpperCase() + str.substr(1);
|
|
118
118
|
}
|
|
119
119
|
exports.capitalize = capitalize;
|
|
120
|
+
/**
|
|
121
|
+
Returns the plural form of a string
|
|
122
|
+
|
|
123
|
+
```javascript
|
|
124
|
+
'innerHTML'.pluralize() // 'InnerHTMLs'
|
|
125
|
+
'action_name'.pluralize() // 'actionNames'
|
|
126
|
+
'css-class-name'.pluralize() // 'cssClassNames'
|
|
127
|
+
'regex'.pluralize() // 'regexes'
|
|
128
|
+
'user'.pluralize() // 'users'
|
|
129
|
+
```
|
|
130
|
+
*/
|
|
131
|
+
function pluralize(str) {
|
|
132
|
+
return camelize([/([^aeiou])y$/, /()fe?$/, /([^aeiou]o|[sxz]|[cs]h)$/].map((c, i) => (str = str.replace(c, `$1${'iv'[i] || ''}e`))) && str + 's');
|
|
133
|
+
}
|
|
134
|
+
exports.pluralize = pluralize;
|
|
120
135
|
function group(name, group) {
|
|
121
|
-
return group ? group
|
|
136
|
+
return group ? `${group}/${name}` : name;
|
|
122
137
|
}
|
|
123
138
|
exports.group = group;
|
|
124
139
|
function featurePath(group, flat, path, name) {
|
|
125
140
|
if (group && !flat) {
|
|
126
|
-
return
|
|
141
|
+
return `../../${path}/${name}/`;
|
|
127
142
|
}
|
|
128
|
-
return group ?
|
|
143
|
+
return group ? `../${path}/` : './';
|
|
129
144
|
}
|
|
130
145
|
exports.featurePath = featurePath;
|
|
131
146
|
});
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../../../../../../modules/entity/schematics-core/utility/strings.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nconst STRING_DASHERIZE_REGEXP = /[ _]/g;\nconst STRING_DECAMELIZE_REGEXP = /([a-z\\d])([A-Z])/g;\nconst STRING_CAMELIZE_REGEXP = /(-|_|\\.|\\s)+(.)?/g;\nconst STRING_UNDERSCORE_REGEXP_1 = /([a-z\\d])([A-Z]+)/g;\nconst STRING_UNDERSCORE_REGEXP_2 = /-|\\s+/g;\n\n/**\n * Converts a camelized string into all lower case separated by underscores.\n *\n ```javascript\n decamelize('innerHTML');         // 'inner_html'\n decamelize('action_name');       // 'action_name'\n decamelize('css-class-name');    // 'css-class-name'\n decamelize('my favorite items'); // 'my favorite items'\n ```\n */\nexport function decamelize(str: string): string {\n  return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();\n}\n\n/**\n Replaces underscores, spaces, or camelCase with dashes.\n\n ```javascript\n dasherize('innerHTML');         // 'inner-html'\n dasherize('action_name');       // 'action-name'\n dasherize('css-class-name');    // 'css-class-name'\n dasherize('my favorite items'); // 'my-favorite-items'\n ```\n */\nexport function dasherize(str?: string): string {\n  return decamelize(str || '').replace(STRING_DASHERIZE_REGEXP, '-');\n}\n\n/**\n Returns the lowerCamelCase form of a string.\n\n ```javascript\n camelize('innerHTML');          // 'innerHTML'\n camelize('action_name');        // 'actionName'\n camelize('css-class-name');     // 'cssClassName'\n camelize('my favorite items');  // 'myFavoriteItems'\n camelize('My Favorite Items');  // 'myFavoriteItems'\n ```\n */\nexport function camelize(str: string): string {\n  return str\n    .replace(\n      STRING_CAMELIZE_REGEXP,\n      (_match: string, _separator: string, chr: string) => {\n        return chr ? chr.toUpperCase() : '';\n      }\n    )\n    .replace(/^([A-Z])/, (match: string) => match.toLowerCase());\n}\n\n/**\n Returns the UpperCamelCase form of a string.\n\n ```javascript\n 'innerHTML'.classify();          // 'InnerHTML'\n 'action_name'.classify();        // 'ActionName'\n 'css-class-name'.classify();     // 'CssClassName'\n 'my favorite items'.classify();  // 'MyFavoriteItems'\n ```\n */\nexport function classify(str: string): string {\n  return str\n    .split('.')\n    .map(part => capitalize(camelize(part)))\n    .join('.');\n}\n\n/**\n More general than decamelize. Returns the lower\\_case\\_and\\_underscored\n form of a string.\n\n ```javascript\n 'innerHTML'.underscore();          // 'inner_html'\n 'action_name'.underscore();        // 'action_name'\n 'css-class-name'.underscore();     // 'css_class_name'\n 'my favorite items'.underscore();  // 'my_favorite_items'\n ```\n */\nexport function underscore(str: string): string {\n  return str\n    .replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2')\n    .replace(STRING_UNDERSCORE_REGEXP_2, '_')\n    .toLowerCase();\n}\n\n/**\n Returns the Capitalized form of a string\n\n ```javascript\n 'innerHTML'.capitalize()         // 'InnerHTML'\n 'action_name'.capitalize()       // 'Action_name'\n 'css-class-name'.capitalize()    // 'Css-class-name'\n 'my favorite items'.capitalize() // 'My favorite items'\n ```\n */\nexport function capitalize(str: string): string {\n  return str.charAt(0).toUpperCase() + str.substr(1);\n}\n\n/**\n Returns the plural form of a string\n\n ```javascript\n 'innerHTML'.pluralize()         // 'InnerHTMLs'\n 'action_name'.pluralize()       // 'actionNames'\n 'css-class-name'.pluralize()    // 'cssClassNames'\n 'regex'.pluralize()            // 'regexes'\n 'user'.pluralize()             // 'users'\n ```\n */\nexport function pluralize(str: string): string {\n  return camelize(\n    [/([^aeiou])y$/, /()fe?$/, /([^aeiou]o|[sxz]|[cs]h)$/].map(\n      (c, i) => (str = str.replace(c, `$1${'iv'[i] || ''}e`))\n    ) && str + 's'\n  );\n}\n\nexport function group(name: string, group: string | undefined) {\n  return group ? `${group}/${name}` : name;\n}\n\nexport function featurePath(\n  group: boolean | undefined,\n  flat: boolean | undefined,\n  path: string,\n  name: string\n) {\n  if (group && !flat) {\n    return `../../${path}/${name}/`;\n  }\n\n  return group ? `../${path}/` : './';\n}\n"]}
|
|
@@ -9,26 +9,26 @@
|
|
|
9
9
|
})(function (require, exports) {
|
|
10
10
|
"use strict";
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
|
|
12
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
13
13
|
function updatePackage(name) {
|
|
14
|
-
return
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
return (tree, context) => {
|
|
15
|
+
const pkgPath = '/package.json';
|
|
16
|
+
const buffer = tree.read(pkgPath);
|
|
17
17
|
if (buffer === null) {
|
|
18
18
|
throw new schematics_1.SchematicsException('Could not read package.json');
|
|
19
19
|
}
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
const content = buffer.toString();
|
|
21
|
+
const pkg = JSON.parse(content);
|
|
22
22
|
if (pkg === null || typeof pkg !== 'object' || Array.isArray(pkg)) {
|
|
23
23
|
throw new schematics_1.SchematicsException('Error reading package.json');
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
dependencyCategories.forEach(
|
|
27
|
-
|
|
25
|
+
const dependencyCategories = ['dependencies', 'devDependencies'];
|
|
26
|
+
dependencyCategories.forEach(category => {
|
|
27
|
+
const packageName = `@ngrx/${name}`;
|
|
28
28
|
if (pkg[category] && pkg[category][packageName]) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
pkg[category][packageName] = suffix
|
|
29
|
+
const firstChar = pkg[category][packageName][0];
|
|
30
|
+
const suffix = match(firstChar, '^') || match(firstChar, '~');
|
|
31
|
+
pkg[category][packageName] = `${suffix}6.0.0`;
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
tree.overwrite(pkgPath, JSON.stringify(pkg, null, 2));
|
|
@@ -40,4 +40,4 @@
|
|
|
40
40
|
return value === test ? test : '';
|
|
41
41
|
}
|
|
42
42
|
});
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vbW9kdWxlcy9lbnRpdHkvc2NoZW1hdGljcy1jb3JlL3V0aWxpdHkvdXBkYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0lBQUEsMkRBS29DO0lBRXBDLFNBQWdCLGFBQWEsQ0FBQyxJQUFZO1FBQ3hDLE9BQU8sQ0FBQyxJQUFVLEVBQUUsT0FBeUIsRUFBRSxFQUFFO1lBQy9DLE1BQU0sT0FBTyxHQUFHLGVBQWUsQ0FBQztZQUNoQyxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ2xDLElBQUksTUFBTSxLQUFLLElBQUksRUFBRTtnQkFDbkIsTUFBTSxJQUFJLGdDQUFtQixDQUFDLDZCQUE2QixDQUFDLENBQUM7YUFDOUQ7WUFDRCxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDbEMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUVoQyxJQUFJLEdBQUcsS0FBSyxJQUFJLElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUU7Z0JBQ2pFLE1BQU0sSUFBSSxnQ0FBbUIsQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO2FBQzdEO1lBRUQsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLGNBQWMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1lBRWpFLG9CQUFvQixDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRTtnQkFDdEMsTUFBTSxXQUFXLEdBQUcsU0FBUyxJQUFJLEVBQUUsQ0FBQztnQkFFcEMsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxFQUFFO29CQUMvQyxNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ2hELE1BQU0sTUFBTSxHQUFHLEtBQUssQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLElBQUksS0FBSyxDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUMsQ0FBQztvQkFFOUQsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLEdBQUcsTUFBTSxPQUFPLENBQUM7aUJBQy9DO1lBQ0gsQ0FBQyxDQUFDLENBQUM7WUFFSCxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUV0RCxPQUFPLElBQUksQ0FBQztRQUNkLENBQUMsQ0FBQztJQUNKLENBQUM7SUEvQkQsc0NBK0JDO0lBRUQsU0FBUyxLQUFLLENBQUMsS0FBYSxFQUFFLElBQVk7UUFDeEMsT0FBTyxLQUFLLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUNwQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgUnVsZSxcbiAgU2NoZW1hdGljQ29udGV4dCxcbiAgVHJlZSxcbiAgU2NoZW1hdGljc0V4Y2VwdGlvbixcbn0gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L3NjaGVtYXRpY3MnO1xuXG5leHBvcnQgZnVuY3Rpb24gdXBkYXRlUGFja2FnZShuYW1lOiBzdHJpbmcpOiBSdWxlIHtcbiAgcmV0dXJuICh0cmVlOiBUcmVlLCBjb250ZXh0OiBTY2hlbWF0aWNDb250ZXh0KSA9PiB7XG4gICAgY29uc3QgcGtnUGF0aCA9ICcvcGFja2FnZS5qc29uJztcbiAgICBjb25zdCBidWZmZXIgPSB0cmVlLnJlYWQocGtnUGF0aCk7XG4gICAgaWYgKGJ1ZmZlciA9PT0gbnVsbCkge1xuICAgICAgdGhyb3cgbmV3IFNjaGVtYXRpY3NFeGNlcHRpb24oJ0NvdWxkIG5vdCByZWFkIHBhY2thZ2UuanNvbicpO1xuICAgIH1cbiAgICBjb25zdCBjb250ZW50ID0gYnVmZmVyLnRvU3RyaW5nKCk7XG4gICAgY29uc3QgcGtnID0gSlNPTi5wYXJzZShjb250ZW50KTtcblxuICAgIGlmIChwa2cgPT09IG51bGwgfHwgdHlwZW9mIHBrZyAhPT0gJ29iamVjdCcgfHwgQXJyYXkuaXNBcnJheShwa2cpKSB7XG4gICAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbignRXJyb3IgcmVhZGluZyBwYWNrYWdlLmpzb24nKTtcbiAgICB9XG5cbiAgICBjb25zdCBkZXBlbmRlbmN5Q2F0ZWdvcmllcyA9IFsnZGVwZW5kZW5jaWVzJywgJ2RldkRlcGVuZGVuY2llcyddO1xuXG4gICAgZGVwZW5kZW5jeUNhdGVnb3JpZXMuZm9yRWFjaChjYXRlZ29yeSA9PiB7XG4gICAgICBjb25zdCBwYWNrYWdlTmFtZSA9IGBAbmdyeC8ke25hbWV9YDtcblxuICAgICAgaWYgKHBrZ1tjYXRlZ29yeV0gJiYgcGtnW2NhdGVnb3J5XVtwYWNrYWdlTmFtZV0pIHtcbiAgICAgICAgY29uc3QgZmlyc3RDaGFyID0gcGtnW2NhdGVnb3J5XVtwYWNrYWdlTmFtZV1bMF07XG4gICAgICAgIGNvbnN0IHN1ZmZpeCA9IG1hdGNoKGZpcnN0Q2hhciwgJ14nKSB8fCBtYXRjaChmaXJzdENoYXIsICd+Jyk7XG5cbiAgICAgICAgcGtnW2NhdGVnb3J5XVtwYWNrYWdlTmFtZV0gPSBgJHtzdWZmaXh9Ni4wLjBgO1xuICAgICAgfVxuICAgIH0pO1xuXG4gICAgdHJlZS5vdmVyd3JpdGUocGtnUGF0aCwgSlNPTi5zdHJpbmdpZnkocGtnLCBudWxsLCAyKSk7XG5cbiAgICByZXR1cm4gdHJlZTtcbiAgfTtcbn1cblxuZnVuY3Rpb24gbWF0Y2godmFsdWU6IHN0cmluZywgdGVzdDogc3RyaW5nKSB7XG4gIHJldHVybiB2YWx1ZSA9PT0gdGVzdCA/IHRlc3QgOiAnJztcbn1cbiJdfQ==
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
/// <amd-module name="@ngrx/entity/schematics-core/utility/route-utils" />
|
|
2
|
-
/**
|
|
3
|
-
* @license
|
|
4
|
-
* Copyright Google Inc. All Rights Reserved.
|
|
5
|
-
*
|
|
6
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
-
* found in the LICENSE file at https://angular.io/license
|
|
8
|
-
*/
|
|
9
|
-
import * as ts from 'typescript';
|
|
10
|
-
import { Change } from './change';
|
|
11
|
-
/**
|
|
12
|
-
* Add Import `import { symbolName } from fileName` if the import doesn't exit
|
|
13
|
-
* already. Assumes fileToEdit can be resolved and accessed.
|
|
14
|
-
* @param fileToEdit (file we want to add import to)
|
|
15
|
-
* @param symbolName (item to import)
|
|
16
|
-
* @param fileName (path to the file)
|
|
17
|
-
* @param isDefault (if true, import follows style for importing default exports)
|
|
18
|
-
* @return Change
|
|
19
|
-
*/
|
|
20
|
-
export declare function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string, fileName: string, isDefault?: boolean): Change;
|
|
@@ -1,84 +0,0 @@
|
|
|
1
|
-
(function (factory) {
|
|
2
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
3
|
-
var v = factory(require, exports);
|
|
4
|
-
if (v !== undefined) module.exports = v;
|
|
5
|
-
}
|
|
6
|
-
else if (typeof define === "function" && define.amd) {
|
|
7
|
-
define("@ngrx/entity/schematics-core/utility/route-utils", ["require", "exports", "typescript", "@ngrx/entity/schematics-core/utility/ast-utils", "@ngrx/entity/schematics-core/utility/change"], factory);
|
|
8
|
-
}
|
|
9
|
-
})(function (require, exports) {
|
|
10
|
-
"use strict";
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
/**
|
|
13
|
-
* @license
|
|
14
|
-
* Copyright Google Inc. All Rights Reserved.
|
|
15
|
-
*
|
|
16
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
17
|
-
* found in the LICENSE file at https://angular.io/license
|
|
18
|
-
*/
|
|
19
|
-
var ts = require("typescript");
|
|
20
|
-
var ast_utils_1 = require("@ngrx/entity/schematics-core/utility/ast-utils");
|
|
21
|
-
var change_1 = require("@ngrx/entity/schematics-core/utility/change");
|
|
22
|
-
/**
|
|
23
|
-
* Add Import `import { symbolName } from fileName` if the import doesn't exit
|
|
24
|
-
* already. Assumes fileToEdit can be resolved and accessed.
|
|
25
|
-
* @param fileToEdit (file we want to add import to)
|
|
26
|
-
* @param symbolName (item to import)
|
|
27
|
-
* @param fileName (path to the file)
|
|
28
|
-
* @param isDefault (if true, import follows style for importing default exports)
|
|
29
|
-
* @return Change
|
|
30
|
-
*/
|
|
31
|
-
function insertImport(source, fileToEdit, symbolName, fileName, isDefault) {
|
|
32
|
-
if (isDefault === void 0) { isDefault = false; }
|
|
33
|
-
var rootNode = source;
|
|
34
|
-
var allImports = ast_utils_1.findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);
|
|
35
|
-
// get nodes that map to import statements from the file fileName
|
|
36
|
-
var relevantImports = allImports.filter(function (node) {
|
|
37
|
-
// StringLiteral of the ImportDeclaration is the import file (fileName in this case).
|
|
38
|
-
var importFiles = node
|
|
39
|
-
.getChildren()
|
|
40
|
-
.filter(function (child) { return child.kind === ts.SyntaxKind.StringLiteral; })
|
|
41
|
-
.map(function (n) { return n.text; });
|
|
42
|
-
return importFiles.filter(function (file) { return file === fileName; }).length === 1;
|
|
43
|
-
});
|
|
44
|
-
if (relevantImports.length > 0) {
|
|
45
|
-
var importsAsterisk_1 = false;
|
|
46
|
-
// imports from import file
|
|
47
|
-
var imports_1 = [];
|
|
48
|
-
relevantImports.forEach(function (n) {
|
|
49
|
-
Array.prototype.push.apply(imports_1, ast_utils_1.findNodes(n, ts.SyntaxKind.Identifier));
|
|
50
|
-
if (ast_utils_1.findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {
|
|
51
|
-
importsAsterisk_1 = true;
|
|
52
|
-
}
|
|
53
|
-
});
|
|
54
|
-
// if imports * from fileName, don't add symbolName
|
|
55
|
-
if (importsAsterisk_1) {
|
|
56
|
-
return new change_1.NoopChange();
|
|
57
|
-
}
|
|
58
|
-
var importTextNodes = imports_1.filter(function (n) { return n.text === symbolName; });
|
|
59
|
-
// insert import if it's not there
|
|
60
|
-
if (importTextNodes.length === 0) {
|
|
61
|
-
var fallbackPos_1 = ast_utils_1.findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
|
|
62
|
-
ast_utils_1.findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
|
|
63
|
-
return ast_utils_1.insertAfterLastOccurrence(imports_1, ", " + symbolName, fileToEdit, fallbackPos_1);
|
|
64
|
-
}
|
|
65
|
-
return new change_1.NoopChange();
|
|
66
|
-
}
|
|
67
|
-
// no such import declaration exists
|
|
68
|
-
var useStrict = ast_utils_1.findNodes(rootNode, ts.SyntaxKind.StringLiteral).filter(function (n) { return n.getText() === 'use strict'; });
|
|
69
|
-
var fallbackPos = 0;
|
|
70
|
-
if (useStrict.length > 0) {
|
|
71
|
-
fallbackPos = useStrict[0].end;
|
|
72
|
-
}
|
|
73
|
-
var open = isDefault ? '' : '{ ';
|
|
74
|
-
var close = isDefault ? '' : ' }';
|
|
75
|
-
// if there are no imports or 'use strict' statement, insert import at beginning of file
|
|
76
|
-
var insertAtBeginning = allImports.length === 0 && useStrict.length === 0;
|
|
77
|
-
var separator = insertAtBeginning ? '' : ';\n';
|
|
78
|
-
var toInsert = separator + "import " + open + symbolName + close +
|
|
79
|
-
(" from '" + fileName + "'" + (insertAtBeginning ? ';\n' : ''));
|
|
80
|
-
return ast_utils_1.insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
|
|
81
|
-
}
|
|
82
|
-
exports.insertImport = insertImport;
|
|
83
|
-
});
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../../../../../../modules/entity/schematics-core/utility/route-utils.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nimport * as ts from 'typescript';\nimport { findNodes, insertAfterLastOccurrence } from './ast-utils';\nimport { Change, NoopChange } from './change';\n\n/**\n * Add Import `import { symbolName } from fileName` if the import doesn't exit\n * already. Assumes fileToEdit can be resolved and accessed.\n * @param fileToEdit (file we want to add import to)\n * @param symbolName (item to import)\n * @param fileName (path to the file)\n * @param isDefault (if true, import follows style for importing default exports)\n * @return Change\n */\n\nexport function insertImport(\n  source: ts.SourceFile,\n  fileToEdit: string,\n  symbolName: string,\n  fileName: string,\n  isDefault = false\n): Change {\n  const rootNode = source;\n  const allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);\n\n  // get nodes that map to import statements from the file fileName\n  const relevantImports = allImports.filter(node => {\n    // StringLiteral of the ImportDeclaration is the import file (fileName in this case).\n    const importFiles = node\n      .getChildren()\n      .filter(child => child.kind === ts.SyntaxKind.StringLiteral)\n      .map(n => (n as ts.StringLiteral).text);\n\n    return importFiles.filter(file => file === fileName).length === 1;\n  });\n\n  if (relevantImports.length > 0) {\n    let importsAsterisk = false;\n    // imports from import file\n    const imports: ts.Node[] = [];\n    relevantImports.forEach(n => {\n      Array.prototype.push.apply(\n        imports,\n        findNodes(n, ts.SyntaxKind.Identifier)\n      );\n      if (findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {\n        importsAsterisk = true;\n      }\n    });\n\n    // if imports * from fileName, don't add symbolName\n    if (importsAsterisk) {\n      return new NoopChange();\n    }\n\n    const importTextNodes = imports.filter(\n      n => (n as ts.Identifier).text === symbolName\n    );\n\n    // insert import if it's not there\n    if (importTextNodes.length === 0) {\n      const fallbackPos =\n        findNodes(\n          relevantImports[0],\n          ts.SyntaxKind.CloseBraceToken\n        )[0].getStart() ||\n        findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();\n\n      return insertAfterLastOccurrence(\n        imports,\n        `, ${symbolName}`,\n        fileToEdit,\n        fallbackPos\n      );\n    }\n\n    return new NoopChange();\n  }\n\n  // no such import declaration exists\n  const useStrict = findNodes(rootNode, ts.SyntaxKind.StringLiteral).filter(\n    n => n.getText() === 'use strict'\n  );\n  let fallbackPos = 0;\n  if (useStrict.length > 0) {\n    fallbackPos = useStrict[0].end;\n  }\n  const open = isDefault ? '' : '{ ';\n  const close = isDefault ? '' : ' }';\n  // if there are no imports or 'use strict' statement, insert import at beginning of file\n  const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;\n  const separator = insertAtBeginning ? '' : ';\\n';\n  const toInsert =\n    `${separator}import ${open}${symbolName}${close}` +\n    ` from '${fileName}'${insertAtBeginning ? ';\\n' : ''}`;\n\n  return insertAfterLastOccurrence(\n    allImports,\n    toInsert,\n    fileToEdit,\n    fallbackPos,\n    ts.SyntaxKind.StringLiteral\n  );\n}\n"]}
|