@dcupl/cli 0.0.23 → 0.0.24

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.
@@ -1,7 +1,7 @@
1
- import { ModelDescription } from '@dcupl/common';
2
- export declare const loadModelFiles: (currentBasePath: string, modelFilesBasePath: string) => ModelDescription<string>[] | undefined;
1
+ import { ModelDefinition } from '@dcupl/common';
2
+ export declare const loadModelFiles: (currentBasePath: string, modelFilesBasePath: string) => ModelDefinition<string>[] | undefined;
3
3
  export declare const getAllModelFilePaths: (modelBasePath: string) => string[];
4
- export declare const loadModelFile: (modelFilePath: string) => ModelDescription[] | null;
5
- export declare const generateTypescriptTypeFromModel: (model: ModelDescription) => string;
4
+ export declare const loadModelFile: (modelFilePath: string) => ModelDefinition[] | null;
5
+ export declare const generateTypescriptTypeFromModel: (model: ModelDefinition) => string;
6
6
  export declare const writeTypeFile: (typeOutput: string, outputFolderName: string, outputFileName: string) => void;
7
7
  export declare const getFormatedTypeOutput: (typeOutput: string) => string;
@@ -47,7 +47,7 @@ const generateTypescriptTypeFromModel = (model) => {
47
47
  output += `${property.key}: ${getTypescriptTypeForProperty(property)};`;
48
48
  output += `\n`;
49
49
  });
50
- model.fields?.forEach((field) => {
50
+ model.references?.forEach((field) => {
51
51
  output += `${field.key}: ${getTypescriptTypeForField(field)};`;
52
52
  output += `\n`;
53
53
  });
@@ -56,7 +56,7 @@ const generateTypescriptTypeFromModel = (model) => {
56
56
  };
57
57
  exports.generateTypescriptTypeFromModel = generateTypescriptTypeFromModel;
58
58
  const getTypescriptTypeForProperty = (property) => {
59
- switch (property.datatype) {
59
+ switch (property.type) {
60
60
  case 'any':
61
61
  return 'any';
62
62
  case 'date':
@@ -1 +1 @@
1
- {"version":3,"file":"generate.helper.js","sourceRoot":"","sources":["../../../../src/functions/generate/types/generate.helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.helper.js","sourceRoot":"","sources":["../../../../src/functions/generate/types/generate.helper.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,7 @@
12
12
  "*.dcupl.lc.json",
13
13
  "dcupl.lc.json",
14
14
  ],
15
- "url": "https://raw.githubusercontent.com/dcupl/dcupl-schema/main/bin/dcupl.loader.schema.json"
15
+ "url": "https://raw.githubusercontent.com/dcupl/dcupl-schema/main/bin/dcupl.loader.vscode.schema.json"
16
16
 
17
17
  }
18
18
  ]
@@ -1,5 +1,5 @@
1
1
  {
2
- "presets": [
2
+ "applications": [
3
3
  {
4
4
  "key": "localhost",
5
5
  "description": "My localhost preset",
@@ -45,7 +45,6 @@
45
45
  ]
46
46
  }
47
47
  ],
48
- "headers": [],
49
48
  "resources": [
50
49
  {
51
50
  "url": "${apiUrl}/models/book.dcupl.json",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "key": "author",
3
- "fields": [
3
+ "references": [
4
4
  {
5
5
  "key": "book_ids",
6
6
  "model": "book",
@@ -10,7 +10,7 @@
10
10
  "properties": [
11
11
  {
12
12
  "key": "author_name",
13
- "datatype": "string"
13
+ "type": "string"
14
14
  }
15
15
  ]
16
16
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "key": "book",
3
- "fields": [
3
+ "references": [
4
4
  {
5
5
  "key": "publisher_id",
6
6
  "model": "publisher",
@@ -20,12 +20,12 @@
20
20
  "properties": [
21
21
  {
22
22
  "key": "title",
23
- "datatype": "string",
23
+ "type": "string",
24
24
  "filter": true
25
25
  },
26
26
  {
27
27
  "key": "language_code",
28
- "datatype": "string"
28
+ "type": "string"
29
29
  }
30
30
  ]
31
31
  }
@@ -3,7 +3,7 @@
3
3
  "properties": [
4
4
  {
5
5
  "key": "language_name",
6
- "datatype": "string"
6
+ "type": "string"
7
7
  }
8
8
  ]
9
9
  }
@@ -3,7 +3,7 @@
3
3
  "properties": [
4
4
  {
5
5
  "key": "publisher_name",
6
- "datatype": "string"
6
+ "type": "string"
7
7
  }
8
8
  ]
9
9
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "key": "address",
3
- "fields": [
3
+ "references": [
4
4
  {
5
5
  "key": "country_id",
6
6
  "model": "country",
@@ -10,11 +10,11 @@
10
10
  "properties": [
11
11
  {
12
12
  "key": "street_number",
13
- "datatype": "string"
13
+ "type": "string"
14
14
  },
15
15
  {
16
16
  "key": "city",
17
- "datatype": "string"
17
+ "type": "string"
18
18
  }
19
19
  ]
20
20
  }
@@ -2,6 +2,6 @@
2
2
  "key": "country",
3
3
  "properties": [{
4
4
  "key": "country_name",
5
- "datatype": "string"
5
+ "type": "string"
6
6
  }]
7
7
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "key": "cust_order",
3
- "fields": [
3
+ "references": [
4
4
  {
5
5
  "key": "customer_id",
6
6
  "model": "customer",
@@ -15,7 +15,7 @@
15
15
  "properties": [
16
16
  {
17
17
  "key": "overall_price",
18
- "datatype": "float"
18
+ "type": "float"
19
19
  }
20
20
  ]
21
21
  }
@@ -1,7 +1,7 @@
1
1
 
2
2
  {
3
3
  "key": "customer",
4
- "fields": [
4
+ "references": [
5
5
  {
6
6
  "key": "addresses",
7
7
  "model": "address",
@@ -21,15 +21,15 @@
21
21
  "properties": [
22
22
  {
23
23
  "key": "first_name",
24
- "datatype": "string"
24
+ "type": "string"
25
25
  },
26
26
  {
27
27
  "key": "last_name",
28
- "datatype": "string"
28
+ "type": "string"
29
29
  },
30
30
  {
31
31
  "key": "email",
32
- "datatype": "string"
32
+ "type": "string"
33
33
  }
34
34
  ]
35
35
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "key": "author",
3
- "fields": [
3
+ "references": [
4
4
  {
5
5
  "key": "book_ids",
6
6
  "model": "book",
@@ -10,7 +10,7 @@
10
10
  "properties": [
11
11
  {
12
12
  "key": "author_name",
13
- "datatype": "string",
13
+ "type": "string",
14
14
  "filter": {
15
15
  "comparisonType": "containsIgnoreCase"
16
16
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "key": "book",
3
- "fields": [
3
+ "references": [
4
4
  {
5
5
  "key": "publisher_id",
6
6
  "model": "publisher",
@@ -31,7 +31,7 @@
31
31
  "properties": [
32
32
  {
33
33
  "key": "title",
34
- "datatype": "string",
34
+ "type": "string",
35
35
  "filter": {
36
36
  "autocompletion": {
37
37
  "maxNrOfSuggestions": 5
@@ -41,15 +41,15 @@
41
41
  },
42
42
  {
43
43
  "key": "isbn13",
44
- "datatype": "string"
44
+ "type": "string"
45
45
  },
46
46
  {
47
47
  "key": "publication_date",
48
- "datatype": "string"
48
+ "type": "string"
49
49
  },
50
50
  {
51
51
  "key": "language",
52
- "datatype": "string",
52
+ "type": "string",
53
53
  "derive": {
54
54
  "localField": "language_code",
55
55
  "remoteProperty": "language_name"
@@ -57,7 +57,7 @@
57
57
  },
58
58
  {
59
59
  "key": "publisher",
60
- "datatype": "string",
60
+ "type": "string",
61
61
  "derive": {
62
62
  "localField": "publisher_id",
63
63
  "remoteProperty": "publisher_name"
@@ -3,7 +3,7 @@
3
3
  "properties": [
4
4
  {
5
5
  "key": "language_name",
6
- "datatype": "string"
6
+ "type": "string"
7
7
  }
8
8
  ]
9
9
  }
@@ -3,7 +3,7 @@
3
3
  "properties": [
4
4
  {
5
5
  "key": "publisher_name",
6
- "datatype": "string",
6
+ "type": "string",
7
7
  "filter":true
8
8
  }
9
9
  ]
@@ -1,5 +1,5 @@
1
1
  {
2
- "presets": [
2
+ "applications": [
3
3
  {
4
4
  "key": "localhost",
5
5
  "description": "My localhost preset",
@@ -3,11 +3,11 @@
3
3
  "properties": [
4
4
  {
5
5
  "key": "todo",
6
- "datatype": "string"
6
+ "type": "string"
7
7
  },
8
8
  {
9
9
  "key": "title",
10
- "datatype": "string",
10
+ "type": "string",
11
11
  "filter": true
12
12
  }
13
13
  ]
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dcupl/cli",
3
- "version": "0.0.23",
3
+ "version": "0.0.24",
4
4
  "description": "The official dcupl CLI",
5
5
  "main": "dist/index.js",
6
6
  "bin": {
@@ -33,7 +33,7 @@
33
33
  "typescript": "^4.5.5"
34
34
  },
35
35
  "dependencies": {
36
- "@dcupl/common": "^0.0.26",
36
+ "@dcupl/common": "^0.0.55",
37
37
  "@nestjs/common": "^8.4.5",
38
38
  "@nestjs/core": "^8.4.5",
39
39
  "@nestjs/platform-express": "^8.4.5",