@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
|
@@ -12,77 +12,72 @@
|
|
|
12
12
|
/**
|
|
13
13
|
* An operation that does nothing.
|
|
14
14
|
*/
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
class NoopChange {
|
|
16
|
+
constructor() {
|
|
17
17
|
this.description = 'No operation.';
|
|
18
18
|
this.order = Infinity;
|
|
19
19
|
this.path = null;
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
apply() {
|
|
22
22
|
return Promise.resolve();
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
}());
|
|
23
|
+
}
|
|
24
|
+
}
|
|
26
25
|
exports.NoopChange = NoopChange;
|
|
27
26
|
/**
|
|
28
27
|
* Will add text to the source code.
|
|
29
28
|
*/
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
class InsertChange {
|
|
30
|
+
constructor(path, pos, toAdd) {
|
|
32
31
|
this.path = path;
|
|
33
32
|
this.pos = pos;
|
|
34
33
|
this.toAdd = toAdd;
|
|
35
34
|
if (pos < 0) {
|
|
36
35
|
throw new Error('Negative positions are invalid');
|
|
37
36
|
}
|
|
38
|
-
this.description =
|
|
37
|
+
this.description = `Inserted ${toAdd} into position ${pos} of ${path}`;
|
|
39
38
|
this.order = pos;
|
|
40
39
|
}
|
|
41
40
|
/**
|
|
42
41
|
* This method does not insert spaces if there is none in the original string.
|
|
43
42
|
*/
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
return host.write(_this.path, "" + prefix + _this.toAdd + suffix);
|
|
43
|
+
apply(host) {
|
|
44
|
+
return host.read(this.path).then(content => {
|
|
45
|
+
const prefix = content.substring(0, this.pos);
|
|
46
|
+
const suffix = content.substring(this.pos);
|
|
47
|
+
return host.write(this.path, `${prefix}${this.toAdd}${suffix}`);
|
|
50
48
|
});
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
}());
|
|
49
|
+
}
|
|
50
|
+
}
|
|
54
51
|
exports.InsertChange = InsertChange;
|
|
55
52
|
/**
|
|
56
53
|
* Will remove text from the source code.
|
|
57
54
|
*/
|
|
58
|
-
|
|
59
|
-
|
|
55
|
+
class RemoveChange {
|
|
56
|
+
constructor(path, pos, toRemove) {
|
|
60
57
|
this.path = path;
|
|
61
58
|
this.pos = pos;
|
|
62
59
|
this.toRemove = toRemove;
|
|
63
60
|
if (pos < 0) {
|
|
64
61
|
throw new Error('Negative positions are invalid');
|
|
65
62
|
}
|
|
66
|
-
this.description =
|
|
63
|
+
this.description = `Removed ${toRemove} into position ${pos} of ${path}`;
|
|
67
64
|
this.order = pos;
|
|
68
65
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
var suffix = content.substring(_this.pos + _this.toRemove.length);
|
|
66
|
+
apply(host) {
|
|
67
|
+
return host.read(this.path).then(content => {
|
|
68
|
+
const prefix = content.substring(0, this.pos);
|
|
69
|
+
const suffix = content.substring(this.pos + this.toRemove.length);
|
|
74
70
|
// TODO: throw error if toRemove doesn't match removed string.
|
|
75
|
-
return host.write(
|
|
71
|
+
return host.write(this.path, `${prefix}${suffix}`);
|
|
76
72
|
});
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
}());
|
|
73
|
+
}
|
|
74
|
+
}
|
|
80
75
|
exports.RemoveChange = RemoveChange;
|
|
81
76
|
/**
|
|
82
77
|
* Will replace text from the source code.
|
|
83
78
|
*/
|
|
84
|
-
|
|
85
|
-
|
|
79
|
+
class ReplaceChange {
|
|
80
|
+
constructor(path, pos, oldText, newText) {
|
|
86
81
|
this.path = path;
|
|
87
82
|
this.pos = pos;
|
|
88
83
|
this.oldText = oldText;
|
|
@@ -90,24 +85,22 @@
|
|
|
90
85
|
if (pos < 0) {
|
|
91
86
|
throw new Error('Negative positions are invalid');
|
|
92
87
|
}
|
|
93
|
-
this.description =
|
|
88
|
+
this.description = `Replaced ${oldText} into position ${pos} of ${path} with ${newText}`;
|
|
94
89
|
this.order = pos;
|
|
95
90
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
return Promise.reject(new Error("Invalid replace: \"" + text + "\" != \"" + _this.oldText + "\"."));
|
|
91
|
+
apply(host) {
|
|
92
|
+
return host.read(this.path).then(content => {
|
|
93
|
+
const prefix = content.substring(0, this.pos);
|
|
94
|
+
const suffix = content.substring(this.pos + this.oldText.length);
|
|
95
|
+
const text = content.substring(this.pos, this.pos + this.oldText.length);
|
|
96
|
+
if (text !== this.oldText) {
|
|
97
|
+
return Promise.reject(new Error(`Invalid replace: "${text}" != "${this.oldText}".`));
|
|
104
98
|
}
|
|
105
99
|
// TODO: throw error if oldText doesn't match removed string.
|
|
106
|
-
return host.write(
|
|
100
|
+
return host.write(this.path, `${prefix}${this.newText}${suffix}`);
|
|
107
101
|
});
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
}());
|
|
102
|
+
}
|
|
103
|
+
}
|
|
111
104
|
exports.ReplaceChange = ReplaceChange;
|
|
112
105
|
});
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"change.js","sourceRoot":"","sources":["../../../../../../../modules/entity/schematics-core/utility/change.ts"],"names":[],"mappings":"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","sourcesContent":["/* istanbul ignore file */\n/**\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 */\nexport interface Host {\n  write(path: string, content: string): Promise<void>;\n  read(path: string): Promise<string>;\n}\n\nexport interface Change {\n  apply(host: Host): Promise<void>;\n\n  // The file this change should be applied to. Some changes might not apply to\n  // a file (maybe the config).\n  readonly path: string | null;\n\n  // The order this change should be applied. Normally the position inside the file.\n  // Changes are applied from the bottom of a file to the top.\n  readonly order: number;\n\n  // The description of this change. This will be outputted in a dry or verbose run.\n  readonly description: string;\n}\n\n/**\n * An operation that does nothing.\n */\nexport class NoopChange implements Change {\n  description = 'No operation.';\n  order = Infinity;\n  path = null;\n  apply() {\n    return Promise.resolve();\n  }\n}\n\n/**\n * Will add text to the source code.\n */\nexport class InsertChange implements Change {\n  order: number;\n  description: string;\n\n  constructor(public path: string, public pos: number, public toAdd: string) {\n    if (pos < 0) {\n      throw new Error('Negative positions are invalid');\n    }\n    this.description = `Inserted ${toAdd} into position ${pos} of ${path}`;\n    this.order = pos;\n  }\n\n  /**\n   * This method does not insert spaces if there is none in the original string.\n   */\n  apply(host: Host) {\n    return host.read(this.path).then(content => {\n      const prefix = content.substring(0, this.pos);\n      const suffix = content.substring(this.pos);\n\n      return host.write(this.path, `${prefix}${this.toAdd}${suffix}`);\n    });\n  }\n}\n\n/**\n * Will remove text from the source code.\n */\nexport class RemoveChange implements Change {\n  order: number;\n  description: string;\n\n  constructor(\n    public path: string,\n    private pos: number,\n    private toRemove: string\n  ) {\n    if (pos < 0) {\n      throw new Error('Negative positions are invalid');\n    }\n    this.description = `Removed ${toRemove} into position ${pos} of ${path}`;\n    this.order = pos;\n  }\n\n  apply(host: Host): Promise<void> {\n    return host.read(this.path).then(content => {\n      const prefix = content.substring(0, this.pos);\n      const suffix = content.substring(this.pos + this.toRemove.length);\n\n      // TODO: throw error if toRemove doesn't match removed string.\n      return host.write(this.path, `${prefix}${suffix}`);\n    });\n  }\n}\n\n/**\n * Will replace text from the source code.\n */\nexport class ReplaceChange implements Change {\n  order: number;\n  description: string;\n\n  constructor(\n    public path: string,\n    private pos: number,\n    public oldText: string,\n    public newText: string\n  ) {\n    if (pos < 0) {\n      throw new Error('Negative positions are invalid');\n    }\n    this.description = `Replaced ${oldText} into position ${pos} of ${path} with ${newText}`;\n    this.order = pos;\n  }\n\n  apply(host: Host): Promise<void> {\n    return host.read(this.path).then(content => {\n      const prefix = content.substring(0, this.pos);\n      const suffix = content.substring(this.pos + this.oldText.length);\n      const text = content.substring(this.pos, this.pos + this.oldText.length);\n\n      if (text !== this.oldText) {\n        return Promise.reject(\n          new Error(`Invalid replace: \"${text}\" != \"${this.oldText}\".`)\n        );\n      }\n\n      // TODO: throw error if oldText doesn't match removed string.\n      return host.write(this.path, `${prefix}${this.newText}${suffix}`);\n    });\n  }\n}\n"]}
|
|
@@ -9,22 +9,22 @@
|
|
|
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 getWorkspacePath(host) {
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
const possibleFiles = ['/angular.json', '/.angular.json'];
|
|
15
|
+
const path = possibleFiles.filter(path => host.exists(path))[0];
|
|
16
16
|
return path;
|
|
17
17
|
}
|
|
18
18
|
exports.getWorkspacePath = getWorkspacePath;
|
|
19
19
|
function getWorkspace(host) {
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
const path = getWorkspacePath(host);
|
|
21
|
+
const configBuffer = host.read(path);
|
|
22
22
|
if (configBuffer === null) {
|
|
23
|
-
throw new schematics_1.SchematicsException(
|
|
23
|
+
throw new schematics_1.SchematicsException(`Could not find (${path})`);
|
|
24
24
|
}
|
|
25
|
-
|
|
25
|
+
const config = configBuffer.toString();
|
|
26
26
|
return JSON.parse(config);
|
|
27
27
|
}
|
|
28
28
|
exports.getWorkspace = getWorkspace;
|
|
29
29
|
});
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vbW9kdWxlcy9lbnRpdHkvc2NoZW1hdGljcy1jb3JlL3V0aWxpdHkvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0lBQUEsMkRBQXVFO0lBa0l2RSxTQUFnQixnQkFBZ0IsQ0FBQyxJQUFVO1FBQ3pDLE1BQU0sYUFBYSxHQUFHLENBQUMsZUFBZSxFQUFFLGdCQUFnQixDQUFDLENBQUM7UUFDMUQsTUFBTSxJQUFJLEdBQUcsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUVoRSxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFMRCw0Q0FLQztJQUVELFNBQWdCLFlBQVksQ0FBQyxJQUFVO1FBQ3JDLE1BQU0sSUFBSSxHQUFHLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BDLE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckMsSUFBSSxZQUFZLEtBQUssSUFBSSxFQUFFO1lBQ3pCLE1BQU0sSUFBSSxnQ0FBbUIsQ0FBQyxtQkFBbUIsSUFBSSxHQUFHLENBQUMsQ0FBQztTQUMzRDtRQUNELE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUV2QyxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDNUIsQ0FBQztJQVRELG9DQVNDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU2NoZW1hdGljc0V4Y2VwdGlvbiwgVHJlZSB9IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9zY2hlbWF0aWNzJztcbmltcG9ydCB7IGV4cGVyaW1lbnRhbCB9IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9jb3JlJztcblxuLy8gVGhlIGludGVyZmFjZXMgYmVsb3cgYXJlIGdlbmVyYXRlZCBmcm9tIHRoZSBBbmd1bGFyIENMSSBjb25maWd1cmF0aW9uIHNjaGVtYVxuLy8gaHR0cHM6Ly9naXRodWIuY29tL2FuZ3VsYXIvYW5ndWxhci1jbGkvYmxvYi9tYXN0ZXIvcGFja2FnZXMvQGFuZ3VsYXIvY2xpL2xpYi9jb25maWcvc2NoZW1hLmpzb25cbmV4cG9ydCBpbnRlcmZhY2UgQXBwQ29uZmlnIHtcbiAgLyoqXG4gICAqIE5hbWUgb2YgdGhlIGFwcC5cbiAgICovXG4gIG5hbWU/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBEaXJlY3Rvcnkgd2hlcmUgYXBwIGZpbGVzIGFyZSBwbGFjZWQuXG4gICAqL1xuICBhcHBSb290Pzogc3RyaW5nO1xuICAvKipcbiAgICogVGhlIHJvb3QgZGlyZWN0b3J5IG9mIHRoZSBhcHAuXG4gICAqL1xuICByb290Pzogc3RyaW5nO1xuICAvKipcbiAgICogVGhlIG91dHB1dCBkaXJlY3RvcnkgZm9yIGJ1aWxkIHJlc3VsdHMuXG4gICAqL1xuICBvdXREaXI/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBMaXN0IG9mIGFwcGxpY2F0aW9uIGFzc2V0cy5cbiAgICovXG4gIGFzc2V0cz86IChcbiAgICB8IHN0cmluZ1xuICAgIHwge1xuICAgICAgICAvKipcbiAgICAgICAgICogVGhlIHBhdHRlcm4gdG8gbWF0Y2guXG4gICAgICAgICAqL1xuICAgICAgICBnbG9iPzogc3RyaW5nO1xuICAgICAgICAvKipcbiAgICAgICAgICogVGhlIGRpciB0byBzZWFyY2ggd2l0aGluLlxuICAgICAgICAgKi9cbiAgICAgICAgaW5wdXQ/OiBzdHJpbmc7XG4gICAgICAgIC8qKlxuICAgICAgICAgKiBUaGUgb3V0cHV0IHBhdGggKHJlbGF0aXZlIHRvIHRoZSBvdXREaXIpLlxuICAgICAgICAgKi9cbiAgICAgICAgb3V0cHV0Pzogc3RyaW5nO1xuICAgICAgfSlbXTtcbiAgLyoqXG4gICAqIFVSTCB3aGVyZSBmaWxlcyB3aWxsIGJlIGRlcGxveWVkLlxuICAgKi9cbiAgZGVwbG95VXJsPzogc3RyaW5nO1xuICAvKipcbiAgICogQmFzZSB1cmwgZm9yIHRoZSBhcHBsaWNhdGlvbiBiZWluZyBidWlsdC5cbiAgICovXG4gIGJhc2VIcmVmPzogc3RyaW5nO1xuICAvKipcbiAgICogVGhlIHJ1bnRpbWUgcGxhdGZvcm0gb2YgdGhlIGFwcC5cbiAgICovXG4gIHBsYXRmb3JtPzogJ2Jyb3dzZXInIHwgJ3NlcnZlcic7XG4gIC8qKlxuICAgKiBUaGUgbmFtZSBvZiB0aGUgc3RhcnQgSFRNTCBmaWxlLlxuICAgKi9cbiAgaW5kZXg/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBUaGUgbmFtZSBvZiB0aGUgbWFpbiBlbnRyeS1wb2ludCBmaWxlLlxuICAgKi9cbiAgbWFpbj86IHN0cmluZztcbiAgLyoqXG4gICAqIFRoZSBuYW1lIG9mIHRoZSBwb2x5ZmlsbHMgZmlsZS5cbiAgICovXG4gIHBvbHlmaWxscz86IHN0cmluZztcbiAgLyoqXG4gICAqIFRoZSBuYW1lIG9mIHRoZSB0ZXN0IGVudHJ5LXBvaW50IGZpbGUuXG4gICAqL1xuICB0ZXN0Pzogc3RyaW5nO1xuICAvKipcbiAgICogVGhlIG5hbWUgb2YgdGhlIFR5cGVTY3JpcHQgY29uZmlndXJhdGlvbiBmaWxlLlxuICAgKi9cbiAgdHNjb25maWc/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBUaGUgbmFtZSBvZiB0aGUgVHlwZVNjcmlwdCBjb25maWd1cmF0aW9uIGZpbGUgZm9yIHVuaXQgdGVzdHMuXG4gICAqL1xuICB0ZXN0VHNjb25maWc/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBUaGUgcHJlZml4IHRvIGFwcGx5IHRvIGdlbmVyYXRlZCBzZWxlY3RvcnMuXG4gICAqL1xuICBwcmVmaXg/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBFeHBlcmltZW50YWwgc3VwcG9ydCBmb3IgYSBzZXJ2aWNlIHdvcmtlciBmcm9tIEBhbmd1bGFyL3NlcnZpY2Utd29ya2VyLlxuICAgKi9cbiAgc2VydmljZVdvcmtlcj86IGJvb2xlYW47XG4gIC8qKlxuICAgKiBHbG9iYWwgc3R5bGVzIHRvIGJlIGluY2x1ZGVkIGluIHRoZSBidWlsZC5cbiAgICovXG4gIHN0eWxlcz86IChcbiAgICB8IHN0cmluZ1xuICAgIHwge1xuICAgICAgICBpbnB1dD86IHN0cmluZztcbiAgICAgICAgW25hbWU6IHN0cmluZ106IGFueTsgLy8gdHNsaW50OmRpc2FibGUtbGluZTpuby1hbnlcbiAgICAgIH0pW107XG4gIC8qKlxuICAgKiBPcHRpb25zIHRvIHBhc3MgdG8gc3R5bGUgcHJlcHJvY2Vzc29yc1xuICAgKi9cbiAgc3R5bGVQcmVwcm9jZXNzb3JPcHRpb25zPzoge1xuICAgIC8qKlxuICAgICAqIFBhdGhzIHRvIGluY2x1ZGUuIFBhdGhzIHdpbGwgYmUgcmVzb2x2ZWQgdG8gcHJvamVjdCByb290LlxuICAgICAqL1xuICAgIGluY2x1ZGVQYXRocz86IHN0cmluZ1tdO1xuICB9O1xuICAvKipcbiAgICogR2xvYmFsIHNjcmlwdHMgdG8gYmUgaW5jbHVkZWQgaW4gdGhlIGJ1aWxkLlxuICAgKi9cbiAgc2NyaXB0cz86IChcbiAgICB8IHN0cmluZ1xuICAgIHwge1xuICAgICAgICBpbnB1dDogc3RyaW5nO1xuICAgICAgICBbbmFtZTogc3RyaW5nXTogYW55OyAvLyB0c2xpbnQ6ZGlzYWJsZS1saW5lOm5vLWFueVxuICAgICAgfSlbXTtcbiAgLyoqXG4gICAqIFNvdXJjZSBmaWxlIGZvciBlbnZpcm9ubWVudCBjb25maWcuXG4gICAqL1xuICBlbnZpcm9ubWVudFNvdXJjZT86IHN0cmluZztcbiAgLyoqXG4gICAqIE5hbWUgYW5kIGNvcnJlc3BvbmRpbmcgZmlsZSBmb3IgZW52aXJvbm1lbnQgY29uZmlnLlxuICAgKi9cbiAgZW52aXJvbm1lbnRzPzoge1xuICAgIFtuYW1lOiBzdHJpbmddOiBhbnk7IC8vIHRzbGludDpkaXNhYmxlLWxpbmU6bm8tYW55XG4gIH07XG4gIGFwcFNoZWxsPzoge1xuICAgIGFwcDogc3RyaW5nO1xuICAgIHJvdXRlOiBzdHJpbmc7XG4gIH07XG59XG5cbmV4cG9ydCB0eXBlIFdvcmtzcGFjZVNjaGVtYSA9IGV4cGVyaW1lbnRhbC53b3Jrc3BhY2UuV29ya3NwYWNlU2NoZW1hO1xuXG5leHBvcnQgZnVuY3Rpb24gZ2V0V29ya3NwYWNlUGF0aChob3N0OiBUcmVlKTogc3RyaW5nIHtcbiAgY29uc3QgcG9zc2libGVGaWxlcyA9IFsnL2FuZ3VsYXIuanNvbicsICcvLmFuZ3VsYXIuanNvbiddO1xuICBjb25zdCBwYXRoID0gcG9zc2libGVGaWxlcy5maWx0ZXIocGF0aCA9PiBob3N0LmV4aXN0cyhwYXRoKSlbMF07XG5cbiAgcmV0dXJuIHBhdGg7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRXb3Jrc3BhY2UoaG9zdDogVHJlZSk6IFdvcmtzcGFjZVNjaGVtYSB7XG4gIGNvbnN0IHBhdGggPSBnZXRXb3Jrc3BhY2VQYXRoKGhvc3QpO1xuICBjb25zdCBjb25maWdCdWZmZXIgPSBob3N0LnJlYWQocGF0aCk7XG4gIGlmIChjb25maWdCdWZmZXIgPT09IG51bGwpIHtcbiAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihgQ291bGQgbm90IGZpbmQgKCR7cGF0aH0pYCk7XG4gIH1cbiAgY29uc3QgY29uZmlnID0gY29uZmlnQnVmZmVyLnRvU3RyaW5nKCk7XG5cbiAgcmV0dXJuIEpTT04ucGFyc2UoY29uZmlnKTtcbn1cbiJdfQ==
|
|
@@ -16,7 +16,7 @@
|
|
|
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
|
-
|
|
19
|
+
const core_1 = require("@angular-devkit/core");
|
|
20
20
|
/**
|
|
21
21
|
* Find the module referred by a set of options passed to the schematics.
|
|
22
22
|
*/
|
|
@@ -25,13 +25,13 @@
|
|
|
25
25
|
return undefined;
|
|
26
26
|
}
|
|
27
27
|
if (!options.module) {
|
|
28
|
-
|
|
28
|
+
const pathToCheck = (options.path || '') +
|
|
29
29
|
(options.flat ? '' : '/' + core_1.strings.dasherize(options.name));
|
|
30
30
|
return core_1.normalize(findModule(host, pathToCheck));
|
|
31
31
|
}
|
|
32
32
|
else {
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
const modulePath = core_1.normalize('/' + options.path + '/' + options.module);
|
|
34
|
+
const moduleBaseName = core_1.normalize(modulePath)
|
|
35
35
|
.split('/')
|
|
36
36
|
.pop();
|
|
37
37
|
if (host.exists(modulePath)) {
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
return core_1.normalize(modulePath + '/' + moduleBaseName + '.module.ts');
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
|
-
throw new Error(
|
|
50
|
+
throw new Error(`Specified module path ${modulePath} does not exist`);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
}
|
|
@@ -56,11 +56,11 @@
|
|
|
56
56
|
* Function to find the "closest" module to a generated file's path.
|
|
57
57
|
*/
|
|
58
58
|
function findModule(host, generateDir) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
let dir = host.getDir('/' + generateDir);
|
|
60
|
+
const moduleRe = /\.module\.ts$/;
|
|
61
|
+
const routingModuleRe = /-routing\.module\.ts/;
|
|
62
62
|
while (dir) {
|
|
63
|
-
|
|
63
|
+
const matches = dir.subfiles.filter(p => moduleRe.test(p) && !routingModuleRe.test(p));
|
|
64
64
|
if (matches.length == 1) {
|
|
65
65
|
return core_1.join(dir.path, matches[0]);
|
|
66
66
|
}
|
|
@@ -78,27 +78,27 @@
|
|
|
78
78
|
* Build a relative path from one file path to another file path.
|
|
79
79
|
*/
|
|
80
80
|
function buildRelativePath(from, to) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
81
|
+
const { path: fromPath, filename: fromFileName, directory: fromDirectory, } = parsePath(from);
|
|
82
|
+
const { path: toPath, filename: toFileName, directory: toDirectory, } = parsePath(to);
|
|
83
|
+
const relativePath = core_1.relative(fromDirectory, toDirectory);
|
|
84
|
+
const fixedRelativePath = relativePath.startsWith('.')
|
|
85
85
|
? relativePath
|
|
86
|
-
:
|
|
86
|
+
: `./${relativePath}`;
|
|
87
87
|
return !toFileName || toFileName === 'index.ts'
|
|
88
88
|
? fixedRelativePath
|
|
89
|
-
:
|
|
89
|
+
: `${fixedRelativePath.endsWith('/')
|
|
90
90
|
? fixedRelativePath
|
|
91
|
-
: fixedRelativePath + '/'
|
|
91
|
+
: fixedRelativePath + '/'}${convertToTypeScriptFileName(toFileName)}`;
|
|
92
92
|
}
|
|
93
93
|
exports.buildRelativePath = buildRelativePath;
|
|
94
94
|
function parsePath(path) {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
95
|
+
const pathNormalized = core_1.normalize(path);
|
|
96
|
+
const filename = core_1.extname(pathNormalized) ? core_1.basename(pathNormalized) : '';
|
|
97
|
+
const directory = filename ? core_1.dirname(pathNormalized) : pathNormalized;
|
|
98
98
|
return {
|
|
99
99
|
path: pathNormalized,
|
|
100
|
-
filename
|
|
101
|
-
directory
|
|
100
|
+
filename,
|
|
101
|
+
directory,
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
/**
|
|
@@ -110,4 +110,4 @@
|
|
|
110
110
|
return filename ? filename.replace(/(\.ts)|(index\.ts)$/, '') : '';
|
|
111
111
|
}
|
|
112
112
|
});
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"find-module.js","sourceRoot":"","sources":["../../../../../../../modules/entity/schematics-core/utility/find-module.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 {\n  Path,\n  join,\n  normalize,\n  relative,\n  strings,\n  basename,\n  extname,\n  dirname,\n} from '@angular-devkit/core';\nimport { DirEntry, Tree } from '@angular-devkit/schematics';\n\nexport interface ModuleOptions {\n  module?: string;\n  name: string;\n  flat?: boolean;\n  path?: string;\n  skipImport?: boolean;\n}\n\n/**\n * Find the module referred by a set of options passed to the schematics.\n */\nexport function findModuleFromOptions(\n  host: Tree,\n  options: ModuleOptions\n): Path | undefined {\n  if (options.hasOwnProperty('skipImport') && options.skipImport) {\n    return undefined;\n  }\n\n  if (!options.module) {\n    const pathToCheck =\n      (options.path || '') +\n      (options.flat ? '' : '/' + strings.dasherize(options.name));\n\n    return normalize(findModule(host, pathToCheck));\n  } else {\n    const modulePath = normalize('/' + options.path + '/' + options.module);\n    const moduleBaseName = normalize(modulePath)\n      .split('/')\n      .pop();\n\n    if (host.exists(modulePath)) {\n      return normalize(modulePath);\n    } else if (host.exists(modulePath + '.ts')) {\n      return normalize(modulePath + '.ts');\n    } else if (host.exists(modulePath + '.module.ts')) {\n      return normalize(modulePath + '.module.ts');\n    } else if (host.exists(modulePath + '/' + moduleBaseName + '.module.ts')) {\n      return normalize(modulePath + '/' + moduleBaseName + '.module.ts');\n    } else {\n      throw new Error(`Specified module path ${modulePath} does not exist`);\n    }\n  }\n}\n\n/**\n * Function to find the \"closest\" module to a generated file's path.\n */\nexport function findModule(host: Tree, generateDir: string): Path {\n  let dir: DirEntry | null = host.getDir('/' + generateDir);\n\n  const moduleRe = /\\.module\\.ts$/;\n  const routingModuleRe = /-routing\\.module\\.ts/;\n\n  while (dir) {\n    const matches = dir.subfiles.filter(\n      p => moduleRe.test(p) && !routingModuleRe.test(p)\n    );\n\n    if (matches.length == 1) {\n      return join(dir.path, matches[0]);\n    } else if (matches.length > 1) {\n      throw new Error(\n        'More than one module matches. Use skip-import option to skip importing ' +\n          'the component into the closest module.'\n      );\n    }\n\n    dir = dir.parent;\n  }\n\n  throw new Error(\n    'Could not find an NgModule. Use the skip-import ' +\n      'option to skip importing in NgModule.'\n  );\n}\n\n/**\n * Build a relative path from one file path to another file path.\n */\nexport function buildRelativePath(from: string, to: string): string {\n  const {\n    path: fromPath,\n    filename: fromFileName,\n    directory: fromDirectory,\n  } = parsePath(from);\n  const {\n    path: toPath,\n    filename: toFileName,\n    directory: toDirectory,\n  } = parsePath(to);\n  const relativePath = relative(fromDirectory, toDirectory);\n  const fixedRelativePath = relativePath.startsWith('.')\n    ? relativePath\n    : `./${relativePath}`;\n\n  return !toFileName || toFileName === 'index.ts'\n    ? fixedRelativePath\n    : `${\n        fixedRelativePath.endsWith('/')\n          ? fixedRelativePath\n          : fixedRelativePath + '/'\n      }${convertToTypeScriptFileName(toFileName)}`;\n}\n\nfunction parsePath(path: string) {\n  const pathNormalized = normalize(path) as Path;\n  const filename = extname(pathNormalized) ? basename(pathNormalized) : '';\n  const directory = filename ? dirname(pathNormalized) : pathNormalized;\n  return {\n    path: pathNormalized,\n    filename,\n    directory,\n  };\n}\n/**\n * Strips the typescript extension and clears index filenames\n * foo.ts -> foo\n * index.ts -> empty\n */\nfunction convertToTypeScriptFileName(filename: string | undefined) {\n  return filename ? filename.replace(/(\\.ts)|(index\\.ts)$/, '') : '';\n}\n"]}
|
|
@@ -8,12 +8,14 @@ export declare function addReducerToState(options: any): Rule;
|
|
|
8
8
|
*/
|
|
9
9
|
export declare function addReducerToStateInterface(source: ts.SourceFile, reducersPath: string, options: {
|
|
10
10
|
name: string;
|
|
11
|
+
plural: boolean;
|
|
11
12
|
}): Change;
|
|
12
13
|
/**
|
|
13
14
|
* Insert the reducer into the ActionReducerMap
|
|
14
15
|
*/
|
|
15
16
|
export declare function addReducerToActionReducerMap(source: ts.SourceFile, reducersPath: string, options: {
|
|
16
17
|
name: string;
|
|
18
|
+
plural: boolean;
|
|
17
19
|
}): Change;
|
|
18
20
|
/**
|
|
19
21
|
* Add reducer feature to NgModule
|