@opra/cli 0.31.2 → 0.31.4

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 (5) hide show
  1. package/cjs/api-exporter/process-resources.js +3 -5
  2. package/cjs/api-exporter/process-types.js +3 -1
  3. package/esm/api-exporter/process-resources.js +3 -5
  4. package/esm/api-exporter/process-types.js +3 -1
  5. package/package.json +2 -2
package/cjs/api-exporter/process-resources.js CHANGED
@@ -6,9 +6,7 @@ const node_path_1 = tslib_1.__importDefault(require("node:path"));
6
6
  const common_1 = require("@opra/common");
7
7
  const string_utils_js_1 = require("../utils/string-utils.js");
8
8
  async function processResource(resource, className, tsFile) {
9
- tsFile.addImport('@opra/client', ['kClient', 'kContext', 'OpraHttpClient']);
10
- const indexTs = this.addFile('/index.ts', true);
11
- indexTs.addExport(tsFile.filename);
9
+ tsFile.addImport('@opra/client', ['kClient', 'OpraHttpClient']);
12
10
  tsFile.content = `\n
13
11
  /**
14
12
  * ${(0, string_utils_js_1.wrapJSDocString)(resource.description || '')}
@@ -49,7 +47,7 @@ export class ${className} {
49
47
  tsFile.addImport('@opra/client', ['HttpCollectionNode']);
50
48
  const typeName = resource.type.name || '';
51
49
  tsFile.addImport(`/types/${typeName}`, [typeName], true);
52
- constructorBody += ` const node = this[kClient].collection('${resource.name}');\n`;
50
+ constructorBody += ` const node = this[kClient].collection('${resource.getFullPath()}');\n`;
53
51
  for (const [operation, endpoint] of resource.operations.entries()) {
54
52
  tsFile.content += `
55
53
  /**
@@ -63,7 +61,7 @@ export class ${className} {
63
61
  tsFile.addImport('@opra/client', ['HttpSingletonNode']);
64
62
  const typeName = resource.type.name || '';
65
63
  tsFile.addImport(`/types/${typeName}`, [typeName], true);
66
- constructorBody += ` const node = this[kClient].singleton('${resource.name}');\n`;
64
+ constructorBody += ` const node = this[kClient].singleton('${resource.getFullPath()}');\n`;
67
65
  for (const [operation, endpoint] of resource.operations.entries()) {
68
66
  tsFile.content += `
69
67
  /**
package/cjs/api-exporter/process-types.js CHANGED
@@ -175,8 +175,10 @@ async function generateSimpleTypeDefinition(file, dataType) {
175
175
  return 'string';
176
176
  if (dataType.extendsFrom('number') || dataType.extendsFrom('integer'))
177
177
  return 'number';
178
- if (dataType.extendsFrom('timestamp') || dataType.extendsFrom('date'))
178
+ if (dataType.extendsFrom('date') || dataType.extendsFrom('datetime'))
179
179
  return 'Date';
180
+ if (dataType.extendsFrom('approxdate') || dataType.extendsFrom('approxdatetime'))
181
+ return 'string';
180
182
  if (dataType.extendsFrom('bigint'))
181
183
  return 'bigint';
182
184
  if (dataType.extendsFrom('object'))
package/esm/api-exporter/process-resources.js CHANGED
@@ -2,9 +2,7 @@ import path from 'node:path';
2
2
  import { Collection, Container, Singleton } from '@opra/common';
3
3
  import { wrapJSDocString } from '../utils/string-utils.js';
4
4
  export async function processResource(resource, className, tsFile) {
5
- tsFile.addImport('@opra/client', ['kClient', 'kContext', 'OpraHttpClient']);
6
- const indexTs = this.addFile('/index.ts', true);
7
- indexTs.addExport(tsFile.filename);
5
+ tsFile.addImport('@opra/client', ['kClient', 'OpraHttpClient']);
8
6
  tsFile.content = `\n
9
7
  /**
10
8
  * ${wrapJSDocString(resource.description || '')}
@@ -45,7 +43,7 @@ export class ${className} {
45
43
  tsFile.addImport('@opra/client', ['HttpCollectionNode']);
46
44
  const typeName = resource.type.name || '';
47
45
  tsFile.addImport(`/types/${typeName}`, [typeName], true);
48
- constructorBody += ` const node = this[kClient].collection('${resource.name}');\n`;
46
+ constructorBody += ` const node = this[kClient].collection('${resource.getFullPath()}');\n`;
49
47
  for (const [operation, endpoint] of resource.operations.entries()) {
50
48
  tsFile.content += `
51
49
  /**
@@ -59,7 +57,7 @@ export class ${className} {
59
57
  tsFile.addImport('@opra/client', ['HttpSingletonNode']);
60
58
  const typeName = resource.type.name || '';
61
59
  tsFile.addImport(`/types/${typeName}`, [typeName], true);
62
- constructorBody += ` const node = this[kClient].singleton('${resource.name}');\n`;
60
+ constructorBody += ` const node = this[kClient].singleton('${resource.getFullPath()}');\n`;
63
61
  for (const [operation, endpoint] of resource.operations.entries()) {
64
62
  tsFile.content += `
65
63
  /**
package/esm/api-exporter/process-types.js CHANGED
@@ -167,8 +167,10 @@ export async function generateSimpleTypeDefinition(file, dataType) {
167
167
  return 'string';
168
168
  if (dataType.extendsFrom('number') || dataType.extendsFrom('integer'))
169
169
  return 'number';
170
- if (dataType.extendsFrom('timestamp') || dataType.extendsFrom('date'))
170
+ if (dataType.extendsFrom('date') || dataType.extendsFrom('datetime'))
171
171
  return 'Date';
172
+ if (dataType.extendsFrom('approxdate') || dataType.extendsFrom('approxdatetime'))
173
+ return 'string';
172
174
  if (dataType.extendsFrom('bigint'))
173
175
  return 'bigint';
174
176
  if (dataType.extendsFrom('object'))
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opra/cli",
3
- "version": "0.31.2",
3
+ "version": "0.31.4",
4
4
  "description": "Opra CLI tools",
5
5
  "author": "Panates",
6
6
  "license": "MIT",
@@ -28,7 +28,7 @@
28
28
  "clean:cover": "rimraf ../../coverage/client"
29
29
  },
30
30
  "dependencies": {
31
- "@opra/client": "^0.31.2",
31
+ "@opra/client": "^0.31.4",
32
32
  "chalk": "^5.3.0",
33
33
  "commander": "^11.0.0",
34
34
  "js-string-escape": "^1.0.1",