namirasoft-sdk-generator 1.2.7 → 1.2.10

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.
Files changed (16) hide show
  1. package/dist/builder/BaseBuilderEnv.d.ts +1 -0
  2. package/dist/builder/BaseBuilderEnv.js +35 -14
  3. package/dist/builder/BaseBuilderEnv.js.map +1 -1
  4. package/dist/builder/npm/NPMBuilder.d.ts +1 -1
  5. package/dist/builder/npm/NPMBuilder.js +89 -16
  6. package/dist/builder/npm/NPMBuilder.js.map +1 -1
  7. package/dist/builder/npm/TS.js +1 -1
  8. package/dist/builder/npm/TS.js.map +1 -1
  9. package/dist/builder/npm/TypeBuilder.d.ts +1 -1
  10. package/dist/builder/npm/TypeBuilder.js +33 -9
  11. package/dist/builder/npm/TypeBuilder.js.map +1 -1
  12. package/package.json +4 -4
  13. package/src/builder/BaseBuilderEnv.ts +40 -16
  14. package/src/builder/npm/NPMBuilder.ts +77 -17
  15. package/src/builder/npm/TS.ts +1 -1
  16. package/src/builder/npm/TypeBuilder.ts +36 -9
package/dist/builder/BaseBuilderEnv.d.ts CHANGED
@@ -2,6 +2,7 @@ export declare class BaseBuilderEnv {
2
2
  private name;
3
3
  directory: string;
4
4
  json: any;
5
+ kepts: string[];
5
6
  constructor(name: string, directory: string);
6
7
  getPath(directory: string): string;
7
8
  mkFolder(directory: string): void;
package/dist/builder/BaseBuilderEnv.js CHANGED
@@ -44,6 +44,7 @@ const child_process_1 = require("child_process");
44
44
  const Logger_1 = require("../Logger");
45
45
  class BaseBuilderEnv {
46
46
  constructor(name, directory) {
47
+ this.kepts = [];
47
48
  this.name = name;
48
49
  this.directory = directory;
49
50
  let json_directory = path.join(directory, "package.json");
@@ -146,36 +147,53 @@ class BaseBuilderEnv {
146
147
  let x = (0, child_process_1.execSync)(commnad, { encoding: 'utf-8' });
147
148
  Logger_1.Logger.log(x);
148
149
  };
149
- let filesToKeep = ['+\\.git$', 'package\\.json', '\\.nsdkgignore'];
150
+ let filesToKeep = ['package.json', '.nsdkg-file-keep', '.nsdkg-dir-keep', '.nsdkg-dir-deep'];
151
+ let foldersToKeep = ['.git'];
152
+ let foldersToDeep = [];
150
153
  try {
151
- let nsdkgignore = fs.readFileSync(this.directory + "/.nsdkgignore").toString();
152
- let lines = nsdkgignore.split('\n').map(m => m.trim()).filter(m => m);
154
+ let nsdkg_file_keep = fs.readFileSync(path.join(this.directory, ".nsdkg-file-keep")).toString();
155
+ let lines = nsdkg_file_keep.split('\n').map(m => m.trim()).filter(m => m);
153
156
  filesToKeep.push(...lines);
154
157
  }
155
158
  catch (error) {
156
159
  }
157
- let shouldKeep = (name) => {
160
+ try {
161
+ let nsdkg_dir_keep = fs.readFileSync(path.join(this.directory, ".nsdkg-dir-keep")).toString();
162
+ let lines = nsdkg_dir_keep.split('\n').map(m => m.trim()).filter(m => m);
163
+ foldersToKeep.push(...lines);
164
+ }
165
+ catch (error) {
166
+ }
167
+ try {
168
+ let nsdkg_dir_deep = fs.readFileSync(path.join(this.directory, ".nsdkg-dir-deep")).toString();
169
+ let lines = nsdkg_dir_deep.split('\n').map(m => m.trim()).filter(m => m);
170
+ foldersToDeep.push(...lines);
171
+ }
172
+ catch (error) {
173
+ }
174
+ let shouldKeep = (name, isDirectory) => {
158
175
  name = name.replace(/\\/gm, "/");
159
- for (let i = 0; i < filesToKeep.length; i++) {
160
- let action = filesToKeep[i][0];
161
- let regex = filesToKeep[i];
162
- if (action == "+" || action == "?")
163
- regex = regex.substring(1);
164
- else
165
- action = "+";
166
- if (new RegExp(regex).test(name))
167
- return action;
176
+ if (isDirectory) {
177
+ if (foldersToKeep.filter(x => name.endsWith(x)).length > 0)
178
+ return "+";
179
+ if (foldersToDeep.filter(x => name.endsWith(x)).length > 0)
180
+ return "?";
181
+ }
182
+ else {
183
+ if (filesToKeep.filter(x => name.endsWith(x)).length > 0)
184
+ return "+";
168
185
  }
169
186
  return "-";
170
187
  };
171
188
  if (!fs.existsSync(this.directory))
172
189
  return;
190
+ let kepts = [];
173
191
  let removeRecursive = function (dir) {
174
192
  const items = fs.readdirSync(dir);
175
193
  items.forEach(item => {
176
194
  const itemPath = path.join(dir, item);
177
195
  let isDirectory = fs.statSync(itemPath).isDirectory();
178
- let action = shouldKeep(itemPath);
196
+ let action = shouldKeep(itemPath, isDirectory);
179
197
  if (action == "-") {
180
198
  if (isDirectory)
181
199
  remove(itemPath);
@@ -184,9 +202,12 @@ class BaseBuilderEnv {
184
202
  }
185
203
  else if (action == "?")
186
204
  removeRecursive(itemPath);
205
+ else
206
+ kepts.push(itemPath);
187
207
  });
188
208
  };
189
209
  removeRecursive(this.directory);
210
+ this.kepts.push(...kepts);
190
211
  }
191
212
  }
192
213
  exports.BaseBuilderEnv = BaseBuilderEnv;
package/dist/builder/BaseBuilderEnv.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseBuilderEnv.js","sourceRoot":"","sources":["../../src/builder/BaseBuilderEnv.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseBuilderEnv.js","sourceRoot":"","sources":["../../src/builder/BaseBuilderEnv.ts"],"names":[],"mappings":"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"}
package/dist/builder/npm/NPMBuilder.d.ts CHANGED
@@ -6,7 +6,7 @@ export declare class NPMBuilder extends BaseBuilder {
6
6
  protected onRun(): Promise<void>;
7
7
  save(ts: TS): void;
8
8
  getIndex(...all: TS[]): TS;
9
- getRow(schema: ObjectSchema): Promise<TS[]>;
9
+ getRow(schema: ObjectSchema): Promise<TS[] | null>;
10
10
  getServer(tags: string[]): TS;
11
11
  getServerBase(): TS;
12
12
  getServerTag(tag: string): TS;
package/dist/builder/npm/NPMBuilder.js CHANGED
@@ -1,4 +1,27 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
26
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
27
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -15,6 +38,7 @@ const namirasoft_core_1 = require("namirasoft-core");
15
38
  const BaseBuilder_1 = require("../BaseBuilder");
16
39
  const TS_1 = require("./TS");
17
40
  const TypeBuilder_1 = require("./TypeBuilder");
41
+ const path = __importStar(require("path"));
18
42
  class NPMBuilder extends BaseBuilder_1.BaseBuilder {
19
43
  constructor(src_directory, dst_directory) {
20
44
  super(src_directory, dst_directory);
@@ -42,11 +66,14 @@ class NPMBuilder extends BaseBuilder_1.BaseBuilder {
42
66
  "author": "Amir Abolhasani",
43
67
  "license": "MIT",
44
68
  "dependencies": {
45
- "namirasoft-core": "^1.1.0"
69
+ "namirasoft-core": "^1.2.0"
46
70
  }
47
71
  };
48
72
  if (this.account)
49
- json.dependencies["namirasoft-account"] = "^1.1.0";
73
+ if (this.dst.json.name != "namirasoft-account")
74
+ json.dependencies["namirasoft-account"] = "^1.2.0";
75
+ else
76
+ json.dependencies["namirasoft-site"] = "^1.2.0";
50
77
  // file
51
78
  this.dst.saveFileJson("package.json", json);
52
79
  // command
@@ -60,7 +87,8 @@ class NPMBuilder extends BaseBuilder_1.BaseBuilder {
60
87
  for (let i = 0; i < objs.length; i++) {
61
88
  const obj = objs[i];
62
89
  let tss = yield this.getRow(obj);
63
- rows.push(...tss);
90
+ if (tss)
91
+ rows.push(...tss);
64
92
  }
65
93
  let server = this.getServer(tags);
66
94
  let server_base = this.getServerBase();
@@ -89,10 +117,17 @@ class NPMBuilder extends BaseBuilder_1.BaseBuilder {
89
117
  getIndex(...all) {
90
118
  let ts = new TS_1.TS("./src", "", "index", "", false);
91
119
  all.forEach(x => ts.imports.push(`export * from "${x.exportPath}${x.name}";`));
120
+ this.dst.kepts.filter(x => x.endsWith('.ts')).map(x => {
121
+ let full = path.join(this.dst.directory, "/src");
122
+ return x.replace(full, ".").replace(".ts", "").replace(/\\/gm, '/');
123
+ }).forEach(x => ts.imports.push(`export * from "${x}";`));
124
+ ;
92
125
  return ts;
93
126
  }
94
127
  getRow(schema) {
95
128
  return __awaiter(this, void 0, void 0, function* () {
129
+ if (schema.external != null)
130
+ return [];
96
131
  let getTS = (name, read_only) => __awaiter(this, void 0, void 0, function* () {
97
132
  let ts = new TS_1.TS("./src/row", "./row/", name, undefined, false);
98
133
  ts.scripts.push(`export type ${name} = `);
@@ -110,8 +145,13 @@ class NPMBuilder extends BaseBuilder_1.BaseBuilder {
110
145
  if (rows) {
111
146
  for (let j = 0; j < rows.length; j++) {
112
147
  const row = rows[j];
113
- let typename = TypeBuilder_1.TypeBuilder.getClassName(row.name);
114
- ts.imports.push(`import { ${typename} } from "./${typename}";`);
148
+ if (row.external == null) {
149
+ let typename = TypeBuilder_1.TypeBuilder.getClassName(row.name);
150
+ if (typename)
151
+ ts.imports.push(`import { ${typename} } from "./${typename}";`);
152
+ }
153
+ else
154
+ ts.imports.push(`import { ${row.name} } from "${row.external.package}";`);
115
155
  }
116
156
  }
117
157
  }
@@ -130,18 +170,31 @@ class NPMBuilder extends BaseBuilder_1.BaseBuilder {
130
170
  let name_row = TypeBuilder_1.TypeBuilder.getClassName(schema.name);
131
171
  let name_input = name_row + "_Input";
132
172
  let name_output = name_row + "_Output";
133
- let row = yield getRowTS(name_row, name_input, name_output);
134
- let input = yield getTS(name_input, false);
135
- let output = yield getTS(name_output, true);
136
- return [row, input, output];
173
+ if (name_row) {
174
+ let row = yield getRowTS(name_row, name_input, name_output);
175
+ let input = yield getTS(name_input, false);
176
+ let output = yield getTS(name_output, true);
177
+ return [row, input, output];
178
+ }
179
+ return null;
137
180
  });
138
181
  }
139
182
  getServer(tags) {
140
183
  let className = this.title.replace(/\s/gm, "") + "Server";
141
184
  let ts = new TS_1.TS("./src", "./", className);
142
- if (this.account)
143
- ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
185
+ if (this.account) {
186
+ if (this.dst.json.name == "namirasoft-account")
187
+ ts.imports.push(`import { TokenManager } from "./TokenManager";`);
188
+ else
189
+ ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
190
+ }
144
191
  tags.forEach(tag => ts.imports.push(`import { ${className}${tag} } from "./${className}${tag}";`));
192
+ if (this.account) {
193
+ ts.fields.push(`manager: TokenManager;`);
194
+ }
195
+ if (this.nws) {
196
+ ts.fields.push(`zone: string;`);
197
+ }
145
198
  tags.forEach(tag => ts.fields.push(`${tag.toLowerCase()}: ${className}${tag};`));
146
199
  let pars = [];
147
200
  let args = [];
@@ -157,6 +210,10 @@ class NPMBuilder extends BaseBuilder_1.BaseBuilder {
157
210
  args.push("onError");
158
211
  ts.constructors.push(`constructor(${pars.join(", ")})`);
159
212
  ts.constructors.push(`{`);
213
+ if (this.account)
214
+ ts.constructors.push(` this.manager = manager;`);
215
+ if (this.nws)
216
+ ts.constructors.push(` this.zone = zone;`);
160
217
  tags.forEach(tag => ts.constructors.push(` this.${tag.toLowerCase()} = new ${className}${tag}(${args.join(", ")});`));
161
218
  ts.constructors.push(`}`);
162
219
  return ts;
@@ -166,8 +223,14 @@ class NPMBuilder extends BaseBuilder_1.BaseBuilder {
166
223
  let parentName = this.account ? "NamirasoftServerBase" : "BaseServer";
167
224
  let ts = new TS_1.TS("./src", "./", className, parentName);
168
225
  if (this.account) {
169
- ts.imports.push(`import { NamirasoftServerBase } from "namirasoft-account";`);
170
- ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
226
+ if (this.dst.json.name == "namirasoft-account") {
227
+ ts.imports.push(`import { NamirasoftServerBase } from "./NamirasoftServerBase";`);
228
+ ts.imports.push(`import { TokenManager } from "./TokenManager";`);
229
+ }
230
+ else {
231
+ ts.imports.push(`import { NamirasoftServerBase } from "namirasoft-account";`);
232
+ ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
233
+ }
171
234
  }
172
235
  else {
173
236
  ts.imports.push(`import { BaseServer } from "namirasoft-core";`);
@@ -237,6 +300,12 @@ class NPMBuilder extends BaseBuilder_1.BaseBuilder {
237
300
  ts.functions.push(`{`);
238
301
  ts.functions.push(` let path = \`${schema.path.replace(/\{/gm, '${')}\`;`);
239
302
  ts.functions.push(` let { data } = await this._${namirasoft_core_1.HTTPMethod[schema.method].toLowerCase()}<${type_output}>(path, ${query}${body});`);
303
+ if (schema.tags["token"] == "changed")
304
+ ts.functions.push(` this.manager.set(data, false);`);
305
+ if (schema.tags["token"] == "deleted")
306
+ ts.functions.push(` this.manager.del();`);
307
+ if (schema.tags["user"] == "changed")
308
+ ts.functions.push(` this.manager.setUser(data);`);
240
309
  ts.functions.push(` return data;`);
241
310
  ts.functions.push(`}`);
242
311
  });
@@ -252,12 +321,16 @@ class NPMBuilder extends BaseBuilder_1.BaseBuilder {
252
321
  if (rows) {
253
322
  for (let j = 0; j < rows.length; j++) {
254
323
  const row = rows[j];
255
- let typename = TypeBuilder_1.TypeBuilder.getClassName(row.name);
256
- ts.imports.push(`import { ${typename + postfix} } from "./row/${typename + postfix}";`);
324
+ if (row.external == null) {
325
+ let typename = TypeBuilder_1.TypeBuilder.getClassName(row.name);
326
+ ts.imports.push(`import { ${typename + postfix} } from "./row/${typename + postfix}";`);
327
+ }
328
+ else
329
+ ts.imports.push(`import { ${row.name} } from "${row.external.package}";`);
257
330
  }
258
331
  }
259
332
  }
260
- return type_output !== null && type_output !== void 0 ? type_output : "string";
333
+ return type_output !== null && type_output !== void 0 ? type_output : "void";
261
334
  });
262
335
  }
263
336
  }
package/dist/builder/npm/NPMBuilder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NPMBuilder.js","sourceRoot":"","sources":["../../../src/builder/npm/NPMBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAkH;AAClH,qDAA6C;AAC7C,gDAA6C;AAC7C,6BAA0B;AAC1B,+CAA4C;AAE5C,MAAa,UAAW,SAAQ,yBAAW;IAEvC,YAAY,aAAqB,EAAE,aAAqB;QAEpD,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACxC,CAAC;IACwB,KAAK;;YAE1B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACjB,SAAS;YACT,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACnC,OAAO;YACP,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACxC,WAAW;YACX,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,uDAAuD,EAAE,YAAY,CAAC,CAAC;YAC/F,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,8DAA8D,EAAE,eAAe,CAAC,CAAC;YACzG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,qEAAqE,EAAE,gBAAgB,CAAC,CAAC;YAEjH,IAAI,IAAI,GAAQ;gBACZ,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,WAAW,EAAE,IAAI,CAAC,WAAW,GAAG,cAAc;gBAC9C,MAAM,EAAE,UAAU;gBAClB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO;gBAChC,MAAM,EAAE,iBAAiB;gBACzB,OAAO,EAAE,mBAAmB;gBAC5B,SAAS,EAAE,EAAE;gBACb,QAAQ,EAAE,iBAAiB;gBAC3B,SAAS,EAAE,KAAK;gBAChB,cAAc,EAAE;oBACZ,iBAAiB,EAAE,QAAQ;iBAC9B;aACJ,CAAC;YACF,IAAI,IAAI,CAAC,OAAO;gBACZ,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,QAAQ,CAAC;YACvD,OAAO;YACP,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YAC5C,UAAU;YACV,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9B,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7B,QAAQ;YACR,IAAI,MAAM,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAChD,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACjE,IAAI,IAAI,GAAS,EAAE,CAAC;YACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EACpC;gBACI,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;aACrB;YACD,IAAI,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,WAAW,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACvC,IAAI,WAAW,GAA0B,EAAE,CAAC;YAC5C,IAAI,OAAO,GAAS,EAAE,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAEf,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBAC/B,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;YACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EACvD;gBACI,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACrC,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;aACjD;YACD,IAAI,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,CAAC;YACrD,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC;YAClC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjB,UAAU;YACV,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;KAAA;IACD,IAAI,CAAC,EAAM;QAEP,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,QAAQ,CAAC,GAAG,GAAS;QAEjB,IAAI,EAAE,GAAG,IAAI,OAAE,CAAC,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QACjD,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAA;QAC9E,OAAO,EAAE,CAAC;IACd,CAAC;IACK,MAAM,CAAC,MAAoB;;YAE7B,IAAI,KAAK,GAAG,CAAO,IAAY,EAAE,SAAkB,EAAE,EAAE;gBAEnD,IAAI,EAAE,GAAG,IAAI,OAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;gBAC/D,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC,CAAC;gBAC1C,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzB,IAAI,MAAM,CAAC,MAAM;oBACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAC7C;wBACI,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wBAC/B,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,IAAI,SAAS,EACrC;4BACI,IAAI,KAAK,GAAG,IAAI,yBAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BACxC,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;4BAC7B,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,IAAI,KAAK,IAAI,GAAG,CAAC,CAAC;4BACnD,IAAI,KAAK,CAAC,IAAI,EACd;gCACI,IAAI,MAAM,GAAG,IAAI,8BAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gCAC/C,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gCACzC,IAAI,IAAI,EACR;oCACI,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EACpC;wCACI,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;wCACpB,IAAI,QAAQ,GAAG,yBAAW,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wCAClD,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,QAAQ,cAAc,QAAQ,IAAI,CAAC,CAAC;qCACnE;iCACJ;6BACJ;yBACJ;qBACJ;gBACL,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzB,OAAO,EAAE,CAAC;YACd,CAAC,CAAA,CAAC;YACF,IAAI,QAAQ,GAAG,CAAO,IAAY,EAAE,UAAkB,EAAE,WAAmB,EAAE,EAAE;gBAE3E,IAAI,EAAE,GAAG,IAAI,OAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;gBAC/D,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,UAAU,cAAc,UAAU,IAAI,CAAC,CAAC;gBACpE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,WAAW,cAAc,WAAW,IAAI,CAAC,CAAC;gBACtE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,IAAI,MAAM,IAAI,YAAY,IAAI,UAAU,CAAC,CAAC;gBACzE,OAAO,EAAE,CAAC;YACd,CAAC,CAAA,CAAC;YACF,IAAI,QAAQ,GAAG,yBAAW,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC;YACrC,IAAI,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;YACvC,IAAI,GAAG,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAC5D,IAAI,KAAK,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAC3C,IAAI,MAAM,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAC5C,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAChC,CAAC;KAAA;IACD,SAAS,CAAC,IAAc;QAEpB,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC;QAC1D,IAAI,EAAE,GAAG,IAAI,OAAE,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,OAAO;YACZ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;QAC1E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,SAAS,GAAG,GAAG,cAAc,SAAS,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC;QACnG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,WAAW,EAAE,KAAK,SAAS,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC;QAEjF,IAAI,IAAI,GAAa,EAAE,CAAC;QACxB,IAAI,IAAI,GAAa,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,OAAO,EAChB;YACI,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACxB;QACD,IAAI,IAAI,CAAC,GAAG,EACZ;YACI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrB;QACD,IAAI,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,WAAW,EAAE,UAAU,SAAS,GAAG,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzH,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,EAAE,CAAC;IACd,CAAC;IACD,aAAa;QAET,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,YAAY,CAAC;QAC9D,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,YAAY,CAAC;QACtE,IAAI,EAAE,GAAG,IAAI,OAAE,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,OAAO,EAChB;YACI,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;YAC9E,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;SACzE;aAED;YACI,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;SACpE;QAED,IAAI,IAAI,GAAa,EAAE,CAAC;QACxB,IAAI,IAAI,GAAa,CAAC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;QACzC,IAAI,IAAI,CAAC,OAAO,EAChB;YACI,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACxB;QACD,IAAI,IAAI,CAAC,GAAG,EACZ;YACI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SAC7B;QACD,IAAI,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAC7C,IAAI,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEzB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB;YACI,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACrC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACpD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YAC1D,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAChD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC1B;QACD,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,EAAE,CAAC;IACd,CAAC;IACD,YAAY,CAAC,GAAW;QAEpB,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC;QACzD,IAAI,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;QACnC,IAAI,SAAS,GAAG,QAAQ,GAAG,GAAG,CAAC;QAC/B,IAAI,EAAE,GAAG,IAAI,OAAE,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACtD,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,UAAU,cAAc,UAAU,IAAI,CAAC,CAAC;QACpE,OAAO,EAAE,CAAC;IACd,CAAC;IACK,WAAW,CAAC,MAAwB,EAAE,EAAM;;YAE9C,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EACjD;gBACI,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBACvC,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACxE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI,GAAG,cAAc,CAAC,CAAC;aACrD;YACD,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAC9C;gBACI,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBACpC,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACxE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI,GAAG,cAAc,CAAC,CAAC;gBAClD,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;aACrC;YACD,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAI,MAAM,CAAC,IAAI,EACf;gBACI,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;gBAC/E,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,cAAc,CAAC,CAAC;gBAC1C,IAAI,GAAG,QAAQ,CAAC;aACnB;YACD,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACpE,IAAI,KAAK,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;YAC7C,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;gBACnB,KAAK,GAAG,IAAI,CAAC;YACjB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,WAAW,GAAG,CAAC,CAAC;YACvF,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9E,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,kCAAkC,4BAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,IAAI,WAAW,WAAW,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC;YACvI,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACtC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;KAAA;IACK,mBAAmB,CAAC,MAA6B,EAAE,EAAM,EAAE,UAAkB,EAAE;;YAEjF,IAAI,WAAW,GAAG,IAAI,CAAC;YACvB,IAAI,MAAM,EACV;gBACI,IAAI,OAAO,GAAG,IAAI,yBAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC/C,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC;gBAClC,IAAI,MAAM,GAAG,IAAI,8BAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBAC3C,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACzC,IAAI,IAAI,EACR;oBACI,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EACpC;wBACI,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;wBACpB,IAAI,QAAQ,GAAG,yBAAW,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wBAClD,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,QAAQ,GAAG,OAAO,kBAAkB,QAAQ,GAAG,OAAO,IAAI,CAAC,CAAC;qBAC3F;iBACJ;aACJ;YACD,OAAO,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,QAAQ,CAAC;QACnC,CAAC;KAAA;CACJ;AAnRD,gCAmRC"}
1
+ {"version":3,"file":"NPMBuilder.js","sourceRoot":"","sources":["../../../src/builder/npm/NPMBuilder.ts"],"names":[],"mappings":"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"}
package/dist/builder/npm/TS.js CHANGED
@@ -83,7 +83,7 @@ class TS {
83
83
  lines.push(...(this.fields.map(x => " " + x)));
84
84
  lines.push(...(this.constructors.map(x => " " + x)));
85
85
  lines.push(...(this.functions.map(x => " " + x)));
86
- lines.push("}");
86
+ lines.push("};");
87
87
  }
88
88
  return lines.join("\n");
89
89
  }
package/dist/builder/npm/TS.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TS.js","sourceRoot":"","sources":["../../../src/builder/npm/TS.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TS.js","sourceRoot":"","sources":["../../../src/builder/npm/TS.ts"],"names":[],"mappings":"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"}
package/dist/builder/npm/TypeBuilder.d.ts CHANGED
@@ -26,5 +26,5 @@ export declare class TypeBuilder extends BaseTypeBuilder<string> {
26
26
  protected _toEnum(schema: EnumSchema): Promise<string>;
27
27
  protected _toArray(schema: ArraySchema): Promise<string>;
28
28
  protected _toObject(schema: ObjectSchema): Promise<string>;
29
- static getClassName(name: string): string;
29
+ static getClassName(name: string, postfix?: string): string | null;
30
30
  }
package/dist/builder/npm/TypeBuilder.js CHANGED
@@ -88,32 +88,32 @@ class TypeBuilder extends namirasoft_schema_1.BaseTypeBuilder {
88
88
  }
89
89
  _toDate(schema) {
90
90
  return __awaiter(this, void 0, void 0, function* () {
91
- return this.toBase(schema, "");
91
+ return this.toBase(schema, "Date");
92
92
  });
93
93
  }
94
94
  _toTime(schema) {
95
95
  return __awaiter(this, void 0, void 0, function* () {
96
- return this.toBase(schema, "");
96
+ return this.toBase(schema, "string");
97
97
  });
98
98
  }
99
99
  _toEmail(schema) {
100
100
  return __awaiter(this, void 0, void 0, function* () {
101
- return this.toBase(schema, "");
101
+ return this.toBase(schema, "string");
102
102
  });
103
103
  }
104
104
  _toPhone(schema) {
105
105
  return __awaiter(this, void 0, void 0, function* () {
106
- return this.toBase(schema, "");
106
+ return this.toBase(schema, "string");
107
107
  });
108
108
  }
109
109
  _toIPV4(schema) {
110
110
  return __awaiter(this, void 0, void 0, function* () {
111
- return this.toBase(schema, "");
111
+ return this.toBase(schema, "string");
112
112
  });
113
113
  }
114
114
  _toIPV6(schema) {
115
115
  return __awaiter(this, void 0, void 0, function* () {
116
- return this.toBase(schema, "");
116
+ return this.toBase(schema, "string");
117
117
  });
118
118
  }
119
119
  _toEnum(schema) {
@@ -143,13 +143,37 @@ class TypeBuilder extends namirasoft_schema_1.BaseTypeBuilder {
143
143
  }
144
144
  _toObject(schema) {
145
145
  return __awaiter(this, void 0, void 0, function* () {
146
- return this.toBase(schema, TypeBuilder.getClassName(schema.name) + this.postfix);
146
+ let type = null;
147
+ if (schema.external != null)
148
+ type = schema.name;
149
+ else
150
+ type = TypeBuilder.getClassName(schema.name, this.postfix);
151
+ if (!type) {
152
+ type = "";
153
+ if (schema.fields == null)
154
+ type = "any";
155
+ else if (schema.fields.length == 0)
156
+ type = "{}";
157
+ else {
158
+ let fields = [];
159
+ for (let i = 0; i < schema.fields.length; i++) {
160
+ const element = schema.fields[i];
161
+ let builder = new TypeBuilder(element.type, this.postfix);
162
+ let fieldtype = yield builder.run();
163
+ fields.push(`${element.name}: ${fieldtype}`);
164
+ }
165
+ type = "{ " + fields.join(", ") + " }";
166
+ }
167
+ }
168
+ return this.toBase(schema, type);
147
169
  });
148
170
  }
149
- static getClassName(name) {
171
+ static getClassName(name, postfix = "") {
172
+ if (!name)
173
+ return null;
150
174
  let ns = name.split('_');
151
175
  ns = ns.map(n => n[0].toUpperCase() + n.substring(1).toLowerCase());
152
- return ns.join("") + "Row";
176
+ return ns.join("") + "Row" + postfix;
153
177
  }
154
178
  }
155
179
  exports.TypeBuilder = TypeBuilder;
package/dist/builder/npm/TypeBuilder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TypeBuilder.js","sourceRoot":"","sources":["../../../src/builder/npm/TypeBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TypeBuilder.js","sourceRoot":"","sources":["../../../src/builder/npm/TypeBuilder.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "namirasoft-sdk-generator",
3
3
  "description": "Namira Software Corporation SDK Generator NPM Package",
4
- "version": "1.2.7",
4
+ "version": "1.2.10",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
7
7
  "scripts": {},
@@ -11,9 +11,9 @@
11
11
  "nsdkg": "./dist/index.js"
12
12
  },
13
13
  "dependencies": {
14
- "@types/node": "^20.10.5",
15
- "axios": "^1.6.2",
14
+ "@types/node": "^20.10.6",
15
+ "axios": "^1.6.3",
16
16
  "namirasoft-log": "^1.2.0",
17
- "namirasoft-schema": "^1.2.8"
17
+ "namirasoft-schema": "^1.2.10"
18
18
  }
19
19
  }
package/src/builder/BaseBuilderEnv.ts CHANGED
@@ -10,6 +10,7 @@ export class BaseBuilderEnv
10
10
  private name: string;
11
11
  public directory: string;
12
12
  public json: any;
13
+ public kepts: string[] = [];
13
14
  constructor(name: string, directory: string)
14
15
  {
15
16
  this.name = name;
@@ -110,7 +111,8 @@ export class BaseBuilderEnv
110
111
  }
111
112
  throw error;
112
113
  }
113
- } clean(): void
114
+ }
115
+ clean(): void
114
116
  {
115
117
  Logger.success("Cleaning environment ...");
116
118
  Logger.log(" env: " + this.name);
@@ -127,35 +129,54 @@ export class BaseBuilderEnv
127
129
  Logger.log(x);
128
130
  };
129
131
 
130
- let filesToKeep = ['+\\.git$', 'package\\.json', '\\.nsdkgignore'];
132
+ let filesToKeep: string[] = ['package.json', '.nsdkg-file-keep', '.nsdkg-dir-keep', '.nsdkg-dir-deep'];
133
+ let foldersToKeep: string[] = ['.git'];
134
+ let foldersToDeep: string[] = [];
131
135
  try
132
136
  {
133
- let nsdkgignore = fs.readFileSync(this.directory + "/.nsdkgignore").toString();
134
- let lines = nsdkgignore.split('\n').map(m => m.trim()).filter(m => m);
137
+ let nsdkg_file_keep = fs.readFileSync(path.join(this.directory, ".nsdkg-file-keep")).toString();
138
+ let lines = nsdkg_file_keep.split('\n').map(m => m.trim()).filter(m => m);
135
139
  filesToKeep.push(...lines);
136
140
  } catch (error)
137
141
  {
138
142
  }
143
+ try
144
+ {
145
+ let nsdkg_dir_keep = fs.readFileSync(path.join(this.directory, ".nsdkg-dir-keep")).toString();
146
+ let lines = nsdkg_dir_keep.split('\n').map(m => m.trim()).filter(m => m);
147
+ foldersToKeep.push(...lines);
148
+ } catch (error)
149
+ {
150
+ }
151
+ try
152
+ {
153
+ let nsdkg_dir_deep = fs.readFileSync(path.join(this.directory, ".nsdkg-dir-deep")).toString();
154
+ let lines = nsdkg_dir_deep.split('\n').map(m => m.trim()).filter(m => m);
155
+ foldersToDeep.push(...lines);
156
+ } catch (error)
157
+ {
158
+ }
139
159
 
140
- let shouldKeep = (name: string) =>
160
+ let shouldKeep = (name: string, isDirectory: boolean) =>
141
161
  {
142
162
  name = name.replace(/\\/gm, "/");
143
- for (let i = 0; i < filesToKeep.length; i++)
163
+ if (isDirectory)
144
164
  {
145
- let action = filesToKeep[i][0];
146
- let regex = filesToKeep[i];
147
- if (action == "+" || action == "?")
148
- regex = regex.substring(1);
149
- else
150
- action = "+";
151
- if (new RegExp(regex).test(name))
152
- return action;
165
+ if (foldersToKeep.filter(x => name.endsWith(x)).length > 0)
166
+ return "+";
167
+ if (foldersToDeep.filter(x => name.endsWith(x)).length > 0)
168
+ return "?";
169
+ }
170
+ else
171
+ {
172
+ if (filesToKeep.filter(x => name.endsWith(x)).length > 0)
173
+ return "+";
153
174
  }
154
175
  return "-";
155
176
  }
156
177
  if (!fs.existsSync(this.directory))
157
178
  return;
158
-
179
+ let kepts: string[] = [];
159
180
  let removeRecursive = function (dir: string)
160
181
  {
161
182
  const items = fs.readdirSync(dir);
@@ -164,7 +185,7 @@ export class BaseBuilderEnv
164
185
  {
165
186
  const itemPath = path.join(dir, item);
166
187
  let isDirectory = fs.statSync(itemPath).isDirectory();
167
- let action = shouldKeep(itemPath);
188
+ let action = shouldKeep(itemPath, isDirectory);
168
189
  if (action == "-")
169
190
  {
170
191
  if (isDirectory)
@@ -174,8 +195,11 @@ export class BaseBuilderEnv
174
195
  }
175
196
  else if (action == "?")
176
197
  removeRecursive(itemPath);
198
+ else
199
+ kepts.push(itemPath);
177
200
  });
178
201
  }
179
202
  removeRecursive(this.directory);
203
+ this.kepts.push(...kepts);
180
204
  }
181
205
  }
package/src/builder/npm/NPMBuilder.ts CHANGED
@@ -3,6 +3,7 @@ import { HTTPMethod } from "namirasoft-core";
3
3
  import { BaseBuilder } from "../BaseBuilder";
4
4
  import { TS } from "./TS";
5
5
  import { TypeBuilder } from "./TypeBuilder";
6
+ import * as path from 'path';
6
7
 
7
8
  export class NPMBuilder extends BaseBuilder
8
9
  {
@@ -34,11 +35,14 @@ export class NPMBuilder extends BaseBuilder
34
35
  "author": "Amir Abolhasani",
35
36
  "license": "MIT",
36
37
  "dependencies": {
37
- "namirasoft-core": "^1.1.0"
38
+ "namirasoft-core": "^1.2.0"
38
39
  }
39
40
  };
40
41
  if (this.account)
41
- json.dependencies["namirasoft-account"] = "^1.1.0";
42
+ if (this.dst.json.name != "namirasoft-account")
43
+ json.dependencies["namirasoft-account"] = "^1.2.0";
44
+ else
45
+ json.dependencies["namirasoft-site"] = "^1.2.0";
42
46
  // file
43
47
  this.dst.saveFileJson("package.json", json);
44
48
  // command
@@ -53,7 +57,8 @@ export class NPMBuilder extends BaseBuilder
53
57
  {
54
58
  const obj = objs[i];
55
59
  let tss = await this.getRow(obj);
56
- rows.push(...tss);
60
+ if (tss)
61
+ rows.push(...tss);
57
62
  }
58
63
  let server = this.getServer(tags);
59
64
  let server_base = this.getServerBase();
@@ -84,11 +89,18 @@ export class NPMBuilder extends BaseBuilder
84
89
  getIndex(...all: TS[]): TS
85
90
  {
86
91
  let ts = new TS("./src", "", "index", "", false);
87
- all.forEach(x => ts.imports.push(`export * from "${x.exportPath}${x.name}";`))
92
+ all.forEach(x => ts.imports.push(`export * from "${x.exportPath}${x.name}";`));
93
+ this.dst.kepts.filter(x => x.endsWith('.ts')).map(x =>
94
+ {
95
+ let full = path.join(this.dst.directory, "/src");
96
+ return x.replace(full, ".").replace(".ts", "").replace(/\\/gm, '/');
97
+ }).forEach(x => ts.imports.push(`export * from "${x}";`));;
88
98
  return ts;
89
99
  }
90
- async getRow(schema: ObjectSchema): Promise<TS[]>
100
+ async getRow(schema: ObjectSchema): Promise<TS[] | null>
91
101
  {
102
+ if (schema.external != null)
103
+ return [];
92
104
  let getTS = async (name: string, read_only: boolean) =>
93
105
  {
94
106
  let ts = new TS("./src/row", "./row/", name, undefined, false);
@@ -112,8 +124,14 @@ export class NPMBuilder extends BaseBuilder
112
124
  for (let j = 0; j < rows.length; j++)
113
125
  {
114
126
  const row = rows[j];
115
- let typename = TypeBuilder.getClassName(row.name);
116
- ts.imports.push(`import { ${typename} } from "./${typename}";`);
127
+ if (row.external == null)
128
+ {
129
+ let typename = TypeBuilder.getClassName(row.name);
130
+ if (typename)
131
+ ts.imports.push(`import { ${typename} } from "./${typename}";`);
132
+ }
133
+ else
134
+ ts.imports.push(`import { ${row.name} } from "${row.external.package}";`);
117
135
  }
118
136
  }
119
137
  }
@@ -133,18 +151,37 @@ export class NPMBuilder extends BaseBuilder
133
151
  let name_row = TypeBuilder.getClassName(schema.name);
134
152
  let name_input = name_row + "_Input";
135
153
  let name_output = name_row + "_Output";
136
- let row = await getRowTS(name_row, name_input, name_output);
137
- let input = await getTS(name_input, false);
138
- let output = await getTS(name_output, true);
139
- return [row, input, output];
154
+ if (name_row)
155
+ {
156
+ let row = await getRowTS(name_row, name_input, name_output);
157
+ let input = await getTS(name_input, false);
158
+ let output = await getTS(name_output, true);
159
+ return [row, input, output];
160
+ }
161
+ return null;
140
162
  }
141
163
  getServer(tags: string[]): TS
142
164
  {
143
165
  let className = this.title.replace(/\s/gm, "") + "Server";
144
166
  let ts = new TS("./src", "./", className);
145
167
  if (this.account)
146
- ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
168
+ {
169
+ if (this.dst.json.name == "namirasoft-account")
170
+ ts.imports.push(`import { TokenManager } from "./TokenManager";`);
171
+ else
172
+ ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
173
+ }
147
174
  tags.forEach(tag => ts.imports.push(`import { ${className}${tag} } from "./${className}${tag}";`));
175
+
176
+ if (this.account)
177
+ {
178
+ ts.fields.push(`manager: TokenManager;`);
179
+ }
180
+ if (this.nws)
181
+ {
182
+ ts.fields.push(`zone: string;`);
183
+ }
184
+
148
185
  tags.forEach(tag => ts.fields.push(`${tag.toLowerCase()}: ${className}${tag};`));
149
186
 
150
187
  let pars: string[] = [];
@@ -163,6 +200,10 @@ export class NPMBuilder extends BaseBuilder
163
200
  args.push("onError");
164
201
  ts.constructors.push(`constructor(${pars.join(", ")})`);
165
202
  ts.constructors.push(`{`);
203
+ if (this.account)
204
+ ts.constructors.push(` this.manager = manager;`);
205
+ if (this.nws)
206
+ ts.constructors.push(` this.zone = zone;`);
166
207
  tags.forEach(tag => ts.constructors.push(` this.${tag.toLowerCase()} = new ${className}${tag}(${args.join(", ")});`));
167
208
  ts.constructors.push(`}`);
168
209
  return ts;
@@ -174,8 +215,16 @@ export class NPMBuilder extends BaseBuilder
174
215
  let ts = new TS("./src", "./", className, parentName);
175
216
  if (this.account)
176
217
  {
177
- ts.imports.push(`import { NamirasoftServerBase } from "namirasoft-account";`);
178
- ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
218
+ if (this.dst.json.name == "namirasoft-account")
219
+ {
220
+ ts.imports.push(`import { NamirasoftServerBase } from "./NamirasoftServerBase";`);
221
+ ts.imports.push(`import { TokenManager } from "./TokenManager";`);
222
+ }
223
+ else
224
+ {
225
+ ts.imports.push(`import { NamirasoftServerBase } from "namirasoft-account";`);
226
+ ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
227
+ }
179
228
  }
180
229
  else
181
230
  {
@@ -255,6 +304,12 @@ export class NPMBuilder extends BaseBuilder
255
304
  ts.functions.push(`{`);
256
305
  ts.functions.push(` let path = \`${schema.path.replace(/\{/gm, '${')}\`;`);
257
306
  ts.functions.push(` let { data } = await this._${HTTPMethod[schema.method].toLowerCase()}<${type_output}>(path, ${query}${body});`);
307
+ if (schema.tags["token"] == "changed")
308
+ ts.functions.push(` this.manager.set(data, false);`);
309
+ if (schema.tags["token"] == "deleted")
310
+ ts.functions.push(` this.manager.del();`);
311
+ if (schema.tags["user"] == "changed")
312
+ ts.functions.push(` this.manager.setUser(data);`);
258
313
  ts.functions.push(` return data;`);
259
314
  ts.functions.push(`}`);
260
315
  }
@@ -272,11 +327,16 @@ export class NPMBuilder extends BaseBuilder
272
327
  for (let j = 0; j < rows.length; j++)
273
328
  {
274
329
  const row = rows[j];
275
- let typename = TypeBuilder.getClassName(row.name);
276
- ts.imports.push(`import { ${typename + postfix} } from "./row/${typename + postfix}";`);
330
+ if (row.external == null)
331
+ {
332
+ let typename = TypeBuilder.getClassName(row.name);
333
+ ts.imports.push(`import { ${typename + postfix} } from "./row/${typename + postfix}";`);
334
+ }
335
+ else
336
+ ts.imports.push(`import { ${row.name} } from "${row.external.package}";`);
277
337
  }
278
338
  }
279
339
  }
280
- return type_output ?? "string";
340
+ return type_output ?? "void";
281
341
  }
282
342
  }
package/src/builder/npm/TS.ts CHANGED
@@ -69,7 +69,7 @@ export class TS
69
69
  lines.push(...(this.fields.map(x => " " + x)));
70
70
  lines.push(...(this.constructors.map(x => " " + x)));
71
71
  lines.push(...(this.functions.map(x => " " + x)));
72
- lines.push("}");
72
+ lines.push("};");
73
73
  }
74
74
  return lines.join("\n");
75
75
  }
package/src/builder/npm/TypeBuilder.ts CHANGED
@@ -69,27 +69,27 @@ export class TypeBuilder extends BaseTypeBuilder<string>
69
69
  }
70
70
  protected override async _toDate(schema: DateSchema)
71
71
  {
72
- return this.toBase(schema, "");
72
+ return this.toBase(schema, "Date");
73
73
  }
74
74
  protected override async _toTime(schema: TimeSchema)
75
75
  {
76
- return this.toBase(schema, "");
76
+ return this.toBase(schema, "string");
77
77
  }
78
78
  protected override async _toEmail(schema: EmailSchema)
79
79
  {
80
- return this.toBase(schema, "");
80
+ return this.toBase(schema, "string");
81
81
  }
82
82
  protected override async _toPhone(schema: PhoneSchema)
83
83
  {
84
- return this.toBase(schema, "");
84
+ return this.toBase(schema, "string");
85
85
  }
86
86
  protected override async _toIPV4(schema: IPV4Schema)
87
87
  {
88
- return this.toBase(schema, "");
88
+ return this.toBase(schema, "string");
89
89
  }
90
90
  protected override async _toIPV6(schema: IPV6Schema)
91
91
  {
92
- return this.toBase(schema, "");
92
+ return this.toBase(schema, "string");
93
93
  }
94
94
  protected override async _toEnum(schema: EnumSchema)
95
95
  {
@@ -117,12 +117,39 @@ export class TypeBuilder extends BaseTypeBuilder<string>
117
117
  }
118
118
  protected override async _toObject(schema: ObjectSchema)
119
119
  {
120
- return this.toBase(schema, TypeBuilder.getClassName(schema.name) + this.postfix);
120
+ let type = null;
121
+ if (schema.external != null)
122
+ type = schema.name;
123
+ else
124
+ type = TypeBuilder.getClassName(schema.name, this.postfix);
125
+ if (!type)
126
+ {
127
+ type = "";
128
+ if (schema.fields == null)
129
+ type = "any";
130
+ else if (schema.fields.length == 0)
131
+ type = "{}";
132
+ else
133
+ {
134
+ let fields: string[] = [];
135
+ for (let i = 0; i < schema.fields.length; i++)
136
+ {
137
+ const element = schema.fields[i];
138
+ let builder = new TypeBuilder(element.type, this.postfix);
139
+ let fieldtype = await builder.run();
140
+ fields.push(`${element.name}: ${fieldtype}`);
141
+ }
142
+ type = "{ " + fields.join(", ") + " }";
143
+ }
144
+ }
145
+ return this.toBase(schema, type);
121
146
  }
122
- static getClassName(name: string): string
147
+ static getClassName(name: string, postfix: string = ""): string | null
123
148
  {
149
+ if (!name)
150
+ return null;
124
151
  let ns = name.split('_');
125
152
  ns = ns.map(n => n[0].toUpperCase() + n.substring(1).toLowerCase());
126
- return ns.join("") + "Row";
153
+ return ns.join("") + "Row" + postfix;
127
154
  }
128
155
  }