angular-three 2.0.0-beta.21 → 2.0.0-beta.23
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/package.json +1 -1
- package/plugin/package.json +1 -1
- package/plugin/src/generators/init/generator.js +28 -17
- package/plugin/src/generators/init/generator.js.map +1 -1
- /package/plugin/src/generators/init/files/experience/{experience.component.html.__tmpl__ → experience.component.html__tmpl__} +0 -0
- /package/plugin/src/generators/init/files/experience/{experience.component.ts.__tmpl__ → experience.component.ts__tmpl__} +0 -0
package/package.json
CHANGED
package/plugin/package.json
CHANGED
|
@@ -4,7 +4,6 @@ const devkit_1 = require("@nx/devkit");
|
|
|
4
4
|
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
5
|
const enquirer_1 = require("enquirer");
|
|
6
6
|
const node_path_1 = require("node:path");
|
|
7
|
-
const typescript_1 = require("typescript");
|
|
8
7
|
const utils_1 = require("../utils");
|
|
9
8
|
const versions_1 = require("../versions");
|
|
10
9
|
async function default_1(tree, { project }) {
|
|
@@ -90,24 +89,36 @@ Please retry the generator with a "--project" specified.`);
|
|
|
90
89
|
AppComponent not found at ${appComponentPath}. Angular Three was initialized successfully but an Experience component was not generated.`);
|
|
91
90
|
}
|
|
92
91
|
else {
|
|
93
|
-
let updatedContent = tsquery_1.tsquery.replace(appComponentContent, 'Identifier[name="imports"] ~ ArrayLiteralExpression', (node) =>
|
|
94
|
-
.
|
|
95
|
-
|
|
96
|
-
typescript_1.factory.createIdentifier('NgtCanvas'),
|
|
97
|
-
])
|
|
98
|
-
.getFullText());
|
|
92
|
+
let updatedContent = tsquery_1.tsquery.replace(appComponentContent, 'Identifier[name="imports"] ~ ArrayLiteralExpression', (node) => {
|
|
93
|
+
return `[${node.elements.map((element) => element['escapedText']).join(', ')}, NgtCanvas]`;
|
|
94
|
+
});
|
|
99
95
|
updatedContent = tsquery_1.tsquery.replace(updatedContent, 'SourceFile', (node) => {
|
|
100
96
|
return `
|
|
101
97
|
import { NgtCanvas } from 'angular-three';
|
|
102
98
|
import { Experience } from './experience/experience.component';
|
|
103
|
-
|
|
99
|
+
|
|
100
|
+
${node.getFullText()}
|
|
101
|
+
`;
|
|
104
102
|
});
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
103
|
+
const contentNode = tsquery_1.tsquery.ast(appComponentContent);
|
|
104
|
+
const classMembersQuery = 'ClassDeclaration > :matches(PropertyDeclaration,MethodDeclaration)';
|
|
105
|
+
const members = tsquery_1.tsquery.match(contentNode, classMembersQuery);
|
|
106
|
+
if (members.length === 0) {
|
|
107
|
+
updatedContent = tsquery_1.tsquery.replace(updatedContent, 'ClassDeclaration', (node) => {
|
|
108
|
+
const withoutBraces = node.getFullText().slice(0, -1);
|
|
109
|
+
return `
|
|
110
|
+
${withoutBraces}
|
|
111
|
+
scene = Experience;
|
|
112
|
+
}`;
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
updatedContent = tsquery_1.tsquery.replace(updatedContent, classMembersQuery, (node) => {
|
|
117
|
+
return `
|
|
118
|
+
scene = Experience;
|
|
119
|
+
${node.getFullText()}`;
|
|
120
|
+
});
|
|
121
|
+
}
|
|
111
122
|
if (appComponentTemplateContent) {
|
|
112
123
|
const updatedTemplateContent = generateExperience === 'append'
|
|
113
124
|
? `
|
|
@@ -119,10 +130,10 @@ ${appComponentTemplateContent}
|
|
|
119
130
|
else {
|
|
120
131
|
updatedContent = tsquery_1.tsquery.replace(updatedContent, 'Identifier[name="template"] ~ NoSubstitutionTemplateLiteral', (node) => {
|
|
121
132
|
return generateExperience === 'append'
|
|
122
|
-
?
|
|
133
|
+
? `\`
|
|
123
134
|
${node.getFullText()}
|
|
124
|
-
<ngt-canvas [sceneGraph]="scene"
|
|
125
|
-
:
|
|
135
|
+
<ngt-canvas [sceneGraph]="scene" />\``
|
|
136
|
+
: `\`<ngt-canvas [sceneGraph]="scene" />\``;
|
|
126
137
|
});
|
|
127
138
|
}
|
|
128
139
|
tree.write(appComponentPath, updatedContent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../libs/plugin/src/generators/init/generator.ts"],"names":[],"mappings":";;AAAA,uCASoB;AACpB,uDAAoD;AACpD,uCAAkC;AAClC,yCAAiC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../libs/plugin/src/generators/init/generator.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|