namirasoft-sdk-generator 1.3.19 → 1.3.20

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 (9) hide show
  1. package/dist/builder/composer/ComposerBuilder.d.ts +0 -1
  2. package/dist/builder/composer/ComposerBuilder.js +21 -49
  3. package/dist/builder/composer/ComposerBuilder.js.map +1 -1
  4. package/dist/builder/composer/PHP.d.ts +1 -0
  5. package/dist/builder/composer/PHP.js +7 -0
  6. package/dist/builder/composer/PHP.js.map +1 -1
  7. package/package.json +2 -2
  8. package/src/builder/composer/ComposerBuilder.ts +34 -27
  9. package/src/builder/composer/PHP.ts +8 -0
package/dist/builder/composer/ComposerBuilder.d.ts CHANGED
@@ -5,7 +5,6 @@ export declare class ComposerBuilder extends BaseBuilder {
5
5
  constructor(src_directory: string, dst_directory: string);
6
6
  protected onRun(): Promise<void>;
7
7
  save(php: PHP): void;
8
- getIndex(...all: PHP[]): PHP;
9
8
  getRow(schema: ObjectSchema): Promise<PHP[] | null>;
10
9
  getEnum(schema: EnumSchema): Promise<PHP[] | null>;
11
10
  getServer(tags: string[]): PHP;
package/dist/builder/composer/ComposerBuilder.js CHANGED
@@ -1,27 +1,4 @@
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
- };
25
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -38,7 +15,6 @@ const namirasoft_core_1 = require("namirasoft-core");
38
15
  const BaseBuilder_1 = require("../BaseBuilder");
39
16
  const PHP_1 = require("./PHP");
40
17
  const TypeBuilder_1 = require("./TypeBuilder");
41
- const path = __importStar(require("path"));
42
18
  class ComposerBuilder extends BaseBuilder_1.BaseBuilder {
43
19
  constructor(src_directory, dst_directory) {
44
20
  super(src_directory, dst_directory);
@@ -68,7 +44,9 @@ class ComposerBuilder extends BaseBuilder_1.BaseBuilder {
68
44
  "Namirasoft\\ApiLink\\": "src/"
69
45
  }
70
46
  },
71
- "require": {}
47
+ "require": {
48
+ "namirasoft/core": "^1.3.0",
49
+ }
72
50
  };
73
51
  let packagejson = {
74
52
  name: this.name,
@@ -86,9 +64,9 @@ class ComposerBuilder extends BaseBuilder_1.BaseBuilder {
86
64
  };
87
65
  if (this.account)
88
66
  if (this.src.json.name != "namirasoft-account-api-v1")
89
- packagejson.dependencies["namirasoft-account"] = "^1.2.0";
67
+ composerjson.require["namirasoft-account"] = "^1.2.0";
90
68
  else
91
- packagejson.dependencies["namirasoft-site"] = "^1.2.0";
69
+ composerjson.require["namirasoft-site"] = "^1.2.0";
92
70
  this.dst.saveFileJson("package.json", packagejson);
93
71
  this.dst.saveFileJson("composer.json", composerjson);
94
72
  yield this.dst.exec("composer update");
@@ -125,24 +103,12 @@ class ComposerBuilder extends BaseBuilder_1.BaseBuilder {
125
103
  }
126
104
  let all = [...rows, server, server_base, ...servers];
127
105
  all.filter(a => a.save).forEach(x => this.save(x));
128
- let index = this.getIndex(...all);
129
- this.save(index);
130
106
  yield this.dst.exec("composer validate");
131
107
  });
132
108
  }
133
109
  save(php) {
134
110
  this.dst.saveFileText(php.getFilePath(), php.getContent());
135
111
  }
136
- getIndex(...all) {
137
- let php = new PHP_1.PHP("./src", "", "index", "", false);
138
- all.filter(a => a.index).forEach(x => php.imports.push(`export * from "${x.exportPath}${x.name}";`));
139
- this.dst.kepts.filter(x => x.endsWith('.php')).map(x => {
140
- let full = path.join(this.dst.directory, "/src");
141
- return x.replace(full, ".").replace(".php", "").replace(/\\/gm, '/');
142
- }).forEach(x => php.imports.push(`export * from "${x}";`));
143
- ;
144
- return php;
145
- }
146
112
  getRow(schema) {
147
113
  return __awaiter(this, void 0, void 0, function* () {
148
114
  if (schema.external != null)
@@ -293,13 +259,19 @@ class ComposerBuilder extends BaseBuilder_1.BaseBuilder {
293
259
  php.constructors.push(`{`);
294
260
  php.constructors.push(` parent::__construct(${args.join(", ")});`);
295
261
  if (!this.account) {
262
+ php.uses.push("use GuzzleHttp\\Psr7\\Response;");
296
263
  php.fields.push("protected $onError;");
297
264
  php.constructors.push(` $this->onError = $onError;`);
298
- php.functions.push(`protected function onBeforeRequest()`);
265
+ php.functions.push(`protected function onBeforeRequest(string $url, array $config = [])`);
266
+ php.functions.push(`{`);
267
+ php.functions.push(`}`);
268
+ php.functions.push(`protected function onAfterRequest(string $url, Response $response)`);
299
269
  php.functions.push(`{`);
300
270
  php.functions.push(`}`);
301
- php.functions.push(`protected function onAfterRequest()`);
271
+ php.functions.push(`protected function onError($error)`);
302
272
  php.functions.push(`{`);
273
+ php.functions.push(` if ($this->onError != null)`);
274
+ php.functions.push(` call_user_func($this->onError);`);
303
275
  php.functions.push(`}`);
304
276
  }
305
277
  php.constructors.push(`}`);
@@ -348,21 +320,21 @@ class ComposerBuilder extends BaseBuilder_1.BaseBuilder {
348
320
  body = ", body";
349
321
  }
350
322
  let type_output = yield this.addFunction_GetType(schema.output, php, null);
351
- let query = "{ " + queries.join(", ") + " }";
323
+ let query = "[ " + queries.map(q => "$" + q).join(", ") + " ]";
352
324
  if (queries.length == 0)
353
- query = "{}";
354
- php.functions.push(`function ${schema.name}(${pars.join(", ")}): ${type_output}`);
325
+ query = "[]";
326
+ php.functions.push(`public function ${schema.name}(${pars.join(", ")}): ${type_output}`);
355
327
  php.functions.push(`{`);
356
328
  php.functions.push(...function_lines.map(l => " " + l));
357
- php.functions.push(` $path = \`${schema.path.replace(/\{/gm, '${')}\`;`);
358
- php.functions.push(` $data = $this->_${namirasoft_core_1.HTTPMethod[schema.method].toLowerCase()}<${type_output}>(path, ${query}${body});`);
329
+ php.functions.push(` $path = "${schema.path.replace(/\{([^\}]+)\}/gm, '$$$1')}";`);
330
+ php.functions.push(` $response = $this->_${namirasoft_core_1.HTTPMethod[schema.method].toLowerCase()}($path, ${query}${body});`);
359
331
  if (schema.tags["token"] == "changed")
360
- php.functions.push(` $this->manager.set(data, false);`);
332
+ php.functions.push(` $this->manager.set($response, false);`);
361
333
  if (schema.tags["token"] == "deleted")
362
334
  php.functions.push(` $this->manager.del();`);
363
335
  if (schema.tags["user"] == "changed")
364
- php.functions.push(` $this->manager.setUser(data);`);
365
- php.functions.push(` return data;`);
336
+ php.functions.push(` $this->manager.setUser($response);`);
337
+ php.functions.push(` return $response->data;`);
366
338
  php.functions.push(`}`);
367
339
  });
368
340
  }
package/dist/builder/composer/ComposerBuilder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ComposerBuilder.js","sourceRoot":"","sources":["../../../src/builder/composer/ComposerBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ComposerBuilder.js","sourceRoot":"","sources":["../../../src/builder/composer/ComposerBuilder.ts"],"names":[],"mappings":"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"}
package/dist/builder/composer/PHP.d.ts CHANGED
@@ -8,6 +8,7 @@ export declare class PHP {
8
8
  has_class: boolean;
9
9
  prelines: string[];
10
10
  imports: string[];
11
+ uses: string[];
11
12
  scripts: string[];
12
13
  fields: string[];
13
14
  constructors: string[];
package/dist/builder/composer/PHP.js CHANGED
@@ -31,6 +31,7 @@ class PHP {
31
31
  this.index = true;
32
32
  this.prelines = [];
33
33
  this.imports = [];
34
+ this.uses = [];
34
35
  this.scripts = [];
35
36
  this.fields = [];
36
37
  this.constructors = [];
@@ -78,6 +79,12 @@ class PHP {
78
79
  lines.push(...is);
79
80
  lines.push("");
80
81
  }
82
+ if (this.uses.length > 0) {
83
+ let us = [...new Set(this.uses)];
84
+ us.sort();
85
+ lines.push(...us);
86
+ lines.push("");
87
+ }
81
88
  if (this.scripts.length > 0) {
82
89
  lines.push(...this.scripts);
83
90
  lines.push("");
package/dist/builder/composer/PHP.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PHP.js","sourceRoot":"","sources":["../../../src/builder/composer/PHP.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PHP.js","sourceRoot":"","sources":["../../../src/builder/composer/PHP.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.3.19",
11
+ "version": "1.3.20",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/index.js",
@@ -17,7 +17,7 @@
17
17
  "build": ""
18
18
  },
19
19
  "dependencies": {
20
- "@types/node": "^20.12.10",
20
+ "@types/node": "^20.12.12",
21
21
  "axios": "^1.6.8",
22
22
  "namirasoft-core": "^1.3.26",
23
23
  "namirasoft-node-cli": "^1.3.8",
package/src/builder/composer/ComposerBuilder.ts CHANGED
@@ -3,7 +3,6 @@ import { HTTPMethod } from "namirasoft-core";
3
3
  import { BaseBuilder } from "../BaseBuilder";
4
4
  import { PHP } from "./PHP";
5
5
  import { TypeBuilder } from "./TypeBuilder";
6
- import * as path from 'path';
7
6
 
8
7
  export class ComposerBuilder extends BaseBuilder
9
8
  {
@@ -40,7 +39,9 @@ export class ComposerBuilder extends BaseBuilder
40
39
  "Namirasoft\\ApiLink\\": "src/"
41
40
  }
42
41
  },
43
- "require": {}
42
+ "require": {
43
+ "namirasoft/core": "^1.3.0",
44
+ }
44
45
  };
45
46
 
46
47
  let packagejson: any = {
@@ -59,9 +60,9 @@ export class ComposerBuilder extends BaseBuilder
59
60
  };
60
61
  if (this.account)
61
62
  if (this.src.json.name != "namirasoft-account-api-v1")
62
- packagejson.dependencies["namirasoft-account"] = "^1.2.0";
63
+ composerjson.require["namirasoft-account"] = "^1.2.0";
63
64
  else
64
- packagejson.dependencies["namirasoft-site"] = "^1.2.0";
65
+ composerjson.require["namirasoft-site"] = "^1.2.0";
65
66
  // file
66
67
  this.dst.saveFileJson("package.json", packagejson);
67
68
  this.dst.saveFileJson("composer.json", composerjson);
@@ -105,8 +106,8 @@ export class ComposerBuilder extends BaseBuilder
105
106
  }
106
107
  let all = [...rows, server, server_base, ...servers];
107
108
  all.filter(a => a.save).forEach(x => this.save(x));
108
- let index = this.getIndex(...all);
109
- this.save(index);
109
+ // let index = this.getIndex(...all);
110
+ // this.save(index);
110
111
  // command
111
112
  await this.dst.exec("composer validate");
112
113
  }
@@ -114,17 +115,17 @@ export class ComposerBuilder extends BaseBuilder
114
115
  {
115
116
  this.dst.saveFileText(php.getFilePath(), php.getContent());
116
117
  }
117
- getIndex(...all: PHP[]): PHP
118
- {
119
- let php = new PHP("./src", "", "index", "", false);
120
- all.filter(a => a.index).forEach(x => php.imports.push(`export * from "${x.exportPath}${x.name}";`));
121
- this.dst.kepts.filter(x => x.endsWith('.php')).map(x =>
122
- {
123
- let full = path.join(this.dst.directory, "/src");
124
- return x.replace(full, ".").replace(".php", "").replace(/\\/gm, '/');
125
- }).forEach(x => php.imports.push(`export * from "${x}";`));;
126
- return php;
127
- }
118
+ // getIndex(...all: PHP[]): PHP
119
+ // {
120
+ // let php = new PHP("./src", "", "index", "", false);
121
+ // all.filter(a => a.index).forEach(x => php.imports.push(`export * from "${x.exportPath}${x.name}";`));
122
+ // this.dst.kepts.filter(x => x.endsWith('.php')).map(x =>
123
+ // {
124
+ // let full = path.join(this.dst.directory, "/src");
125
+ // return x.replace(full, ".").replace(".php", "").replace(/\\/gm, '/');
126
+ // }).forEach(x => php.imports.push(`export * from "${x}";`));;
127
+ // return php;
128
+ // }
128
129
  async getRow(schema: ObjectSchema): Promise<PHP[] | null>
129
130
  {
130
131
  if (schema.external != null)
@@ -308,13 +309,19 @@ export class ComposerBuilder extends BaseBuilder
308
309
  php.constructors.push(` parent::__construct(${args.join(", ")});`);
309
310
  if (!this.account)
310
311
  {
312
+ php.uses.push("use GuzzleHttp\\Psr7\\Response;");
311
313
  php.fields.push("protected $onError;");
312
314
  php.constructors.push(` $this->onError = $onError;`);
313
- php.functions.push(`protected function onBeforeRequest()`);
315
+ php.functions.push(`protected function onBeforeRequest(string $url, array $config = [])`);
316
+ php.functions.push(`{`);
317
+ php.functions.push(`}`);
318
+ php.functions.push(`protected function onAfterRequest(string $url, Response $response)`);
314
319
  php.functions.push(`{`);
315
320
  php.functions.push(`}`);
316
- php.functions.push(`protected function onAfterRequest()`);
321
+ php.functions.push(`protected function onError($error)`);
317
322
  php.functions.push(`{`);
323
+ php.functions.push(` if ($this->onError != null)`);
324
+ php.functions.push(` call_user_func($this->onError);`);
318
325
  php.functions.push(`}`);
319
326
  }
320
327
  php.constructors.push(`}`);
@@ -368,21 +375,21 @@ export class ComposerBuilder extends BaseBuilder
368
375
  body = ", body";
369
376
  }
370
377
  let type_output = await this.addFunction_GetType(schema.output, php, null);
371
- let query = "{ " + queries.join(", ") + " }";
378
+ let query = "[ " + queries.map(q => "$" + q).join(", ") + " ]";
372
379
  if (queries.length == 0)
373
- query = "{}";
374
- php.functions.push(`function ${schema.name}(${pars.join(", ")}): ${type_output}`);
380
+ query = "[]";
381
+ php.functions.push(`public function ${schema.name}(${pars.join(", ")}): ${type_output}`);
375
382
  php.functions.push(`{`);
376
383
  php.functions.push(...function_lines.map(l => " " + l));
377
- php.functions.push(` $path = \`${schema.path.replace(/\{/gm, '${')}\`;`);
378
- php.functions.push(` $data = $this->_${HTTPMethod[schema.method].toLowerCase()}<${type_output}>(path, ${query}${body});`);
384
+ php.functions.push(` $path = "${schema.path.replace(/\{([^\}]+)\}/gm, '$$$1')}";`);
385
+ php.functions.push(` $response = $this->_${HTTPMethod[schema.method].toLowerCase()}($path, ${query}${body});`);
379
386
  if (schema.tags["token"] == "changed")
380
- php.functions.push(` $this->manager.set(data, false);`);
387
+ php.functions.push(` $this->manager.set($response, false);`);
381
388
  if (schema.tags["token"] == "deleted")
382
389
  php.functions.push(` $this->manager.del();`);
383
390
  if (schema.tags["user"] == "changed")
384
- php.functions.push(` $this->manager.setUser(data);`);
385
- php.functions.push(` return data;`);
391
+ php.functions.push(` $this->manager.setUser($response);`);
392
+ php.functions.push(` return $response->data;`);
386
393
  php.functions.push(`}`);
387
394
  }
388
395
  async addFunction_GetType(schema: BaseTypeSchema | null, php: PHP, read_only: boolean | null, postfix: string = ""): Promise<string>
package/src/builder/composer/PHP.ts CHANGED
@@ -10,6 +10,7 @@ export class PHP
10
10
  has_class: boolean;
11
11
  prelines: string[] = [];
12
12
  imports: string[] = [];
13
+ uses: string[] = [];
13
14
  scripts: string[] = [];
14
15
  fields: string[] = [];
15
16
  constructors: string[] = [];
@@ -62,6 +63,13 @@ export class PHP
62
63
  lines.push(...is);
63
64
  lines.push("");
64
65
  }
66
+ if (this.uses.length > 0)
67
+ {
68
+ let us = [...new Set(this.uses)];
69
+ us.sort();
70
+ lines.push(...us);
71
+ lines.push("");
72
+ }
65
73
  if (this.scripts.length > 0)
66
74
  {
67
75
  lines.push(...this.scripts);