@kumori/kdsl 0.0.26 → 0.0.28
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/dist/build/helpers/connector.js +8 -8
- package/dist/build/helpers/connector.js.map +1 -1
- package/dist/build/helpers/deployment.d.ts +11 -11
- package/dist/deployment/gen/main.js +12 -1
- package/dist/deployment/gen/main.js.map +1 -1
- package/dist/lib/io/lib.kumori +2 -0
- package/dist/lib/kumori/builtin/httpinbound.h.kumori +2 -0
- package/dist/lib/kumori/builtin/tcpinbound.h.kumori +2 -0
- package/dist/lib/kumori/builtin.kumori +2 -0
- package/dist/lib/kumori/component.kumori +2 -0
- package/dist/lib/kumori/deployment.kumori +2 -0
- package/dist/lib/kumori/resource.kumori +2 -0
- package/dist/lib/kumori/service.kumori +2 -0
- package/dist/lib/strconv/lib.kumori +2 -0
- package/out/lib/io/lib.kumori +2 -0
- package/out/lib/kumori/builtin/httpinbound.h.kumori +2 -0
- package/out/lib/kumori/builtin/tcpinbound.h.kumori +2 -0
- package/out/lib/kumori/builtin.kumori +2 -0
- package/out/lib/kumori/component.kumori +2 -0
- package/out/lib/kumori/deployment.kumori +2 -0
- package/out/lib/kumori/resource.kumori +2 -0
- package/out/lib/kumori/service.kumori +2 -0
- package/out/lib/strconv/lib.kumori +2 -0
- package/out/main.cjs +251 -308
- package/package.json +1 -1
|
@@ -87,13 +87,13 @@ export function ServiceConnectionToSolutionJSON(ctx, service, cnx) {
|
|
|
87
87
|
const componentRef = service.role[toCnx.target == "self" ? fromCnx.target : toCnx.target];
|
|
88
88
|
const isServiceKind = isService(componentRef.artifact) || toCnx.target == "self";
|
|
89
89
|
resolveReference(ctx, componentRef, ref, isServiceKind);
|
|
90
|
-
const meta =
|
|
90
|
+
const meta = [{
|
|
91
91
|
auto: {
|
|
92
92
|
channel: toCnx.target !== "self" ? toCnx.target + "." + toCnx.channel : toCnx.channel,
|
|
93
93
|
compRef: ref,
|
|
94
94
|
roleName: toCnx.target == "self" ? fromCnx.target : toCnx.target,
|
|
95
95
|
},
|
|
96
|
-
user: {}
|
|
96
|
+
user: cnx.value.meta ?? {}
|
|
97
97
|
}];
|
|
98
98
|
const server = buildServer(meta, toCnx.target, toCnx.channel);
|
|
99
99
|
// We don't want duplicates
|
|
@@ -112,13 +112,13 @@ export function ServiceConnectionToSolutionJSON(ctx, service, cnx) {
|
|
|
112
112
|
const componentRef = service.role[toCnx.target == "self" ? fromCnx.target : toCnx.target];
|
|
113
113
|
const isServiceKind = isService(componentRef.artifact) || toCnx.target == "self";
|
|
114
114
|
resolveReference(ctx, componentRef, ref, isServiceKind);
|
|
115
|
-
const meta =
|
|
115
|
+
const meta = [{
|
|
116
116
|
auto: {
|
|
117
117
|
channel: toCnx.target !== "self" ? toCnx.target + "." + toCnx.channel : toCnx.channel,
|
|
118
118
|
compRef: ref,
|
|
119
119
|
roleName: toCnx.target == "self" ? fromCnx.target : toCnx.target,
|
|
120
120
|
},
|
|
121
|
-
user: {}
|
|
121
|
+
user: cnx.value.meta ?? {}
|
|
122
122
|
}];
|
|
123
123
|
const server = buildServer(meta, toCnx.target, toCnx.channel);
|
|
124
124
|
// We don't want duplicates
|
|
@@ -148,13 +148,13 @@ export function ServiceConnectionToSolutionJSON(ctx, service, cnx) {
|
|
|
148
148
|
const componentRef = service.role[toCnx.target == "self" ? fromCnx.target : toCnx.target];
|
|
149
149
|
const isServiceKind = isService(componentRef.artifact);
|
|
150
150
|
resolveReference(ctx, componentRef, ref, isServiceKind);
|
|
151
|
-
const meta =
|
|
151
|
+
const meta = [{
|
|
152
152
|
auto: {
|
|
153
153
|
channel: toCnx.target !== "self" ? toCnx.target + "." + toCnx.channel : toCnx.channel,
|
|
154
154
|
compRef: ref,
|
|
155
155
|
roleName: toCnx.target == "self" ? fromCnx.target : toCnx.target,
|
|
156
156
|
},
|
|
157
|
-
user: {}
|
|
157
|
+
user: cnx.value.meta ?? {}
|
|
158
158
|
}];
|
|
159
159
|
const server = buildServer(meta, toCnx.target, toCnx.channel);
|
|
160
160
|
// We don't want duplicates
|
|
@@ -168,13 +168,13 @@ export function ServiceConnectionToSolutionJSON(ctx, service, cnx) {
|
|
|
168
168
|
const componentRef = service.role[cnx.value.target];
|
|
169
169
|
const isServiceKind = isService(componentRef.artifact);
|
|
170
170
|
resolveReference(ctx, componentRef, ref, isServiceKind);
|
|
171
|
-
const meta =
|
|
171
|
+
const meta = [{
|
|
172
172
|
auto: {
|
|
173
173
|
channel: cnx.value.channel,
|
|
174
174
|
compRef: ref,
|
|
175
175
|
roleName: cnx.value.target,
|
|
176
176
|
},
|
|
177
|
-
user: {}
|
|
177
|
+
user: cnx.value.meta ?? {}
|
|
178
178
|
}];
|
|
179
179
|
servers.push(buildServer(meta, cnx.value.target, cnx.value.channel));
|
|
180
180
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../../src/build/helpers/connector.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../../src/build/helpers/connector.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,19 +55,19 @@ export declare const AddDeployment: (ctx: SolutionJSONContext, dep: V3Deployment
|
|
|
55
55
|
srv?: {
|
|
56
56
|
duplex?: Record<string, {
|
|
57
57
|
inherited: boolean;
|
|
58
|
-
protocol: "
|
|
58
|
+
protocol: "udp" | "tcp" | "http" | "grpc";
|
|
59
59
|
port?: number | undefined;
|
|
60
60
|
portnum?: number | undefined;
|
|
61
61
|
}> | undefined;
|
|
62
62
|
client?: Record<string, {
|
|
63
63
|
inherited: boolean;
|
|
64
|
-
protocol: "
|
|
64
|
+
protocol: "udp" | "tcp" | "http" | "grpc";
|
|
65
65
|
port?: number | undefined;
|
|
66
66
|
portnum?: number | undefined;
|
|
67
67
|
}> | undefined;
|
|
68
68
|
server?: Record<string, {
|
|
69
69
|
inherited: boolean;
|
|
70
|
-
protocol: "
|
|
70
|
+
protocol: "udp" | "tcp" | "http" | "grpc";
|
|
71
71
|
port?: number | undefined;
|
|
72
72
|
portnum?: number | undefined;
|
|
73
73
|
}> | undefined;
|
|
@@ -89,12 +89,12 @@ export declare const AddDeployment: (ctx: SolutionJSONContext, dep: V3Deployment
|
|
|
89
89
|
builtin: boolean;
|
|
90
90
|
size: {
|
|
91
91
|
mincpu: {
|
|
92
|
-
kind: "
|
|
92
|
+
kind: "bandwidth" | "storage" | "cpu" | "ram";
|
|
93
93
|
size: number;
|
|
94
94
|
unit: string;
|
|
95
95
|
};
|
|
96
96
|
bandwidth: {
|
|
97
|
-
kind: "
|
|
97
|
+
kind: "bandwidth" | "storage" | "cpu" | "ram";
|
|
98
98
|
size: number;
|
|
99
99
|
unit: string;
|
|
100
100
|
};
|
|
@@ -124,19 +124,19 @@ export declare const AddDeployment: (ctx: SolutionJSONContext, dep: V3Deployment
|
|
|
124
124
|
srv?: {
|
|
125
125
|
duplex?: Record<string, {
|
|
126
126
|
inherited: boolean;
|
|
127
|
-
protocol: "
|
|
127
|
+
protocol: "udp" | "tcp" | "http" | "grpc";
|
|
128
128
|
port?: number | undefined;
|
|
129
129
|
portnum?: number | undefined;
|
|
130
130
|
}> | undefined;
|
|
131
131
|
client?: Record<string, {
|
|
132
132
|
inherited: boolean;
|
|
133
|
-
protocol: "
|
|
133
|
+
protocol: "udp" | "tcp" | "http" | "grpc";
|
|
134
134
|
port?: number | undefined;
|
|
135
135
|
portnum?: number | undefined;
|
|
136
136
|
}> | undefined;
|
|
137
137
|
server?: Record<string, {
|
|
138
138
|
inherited: boolean;
|
|
139
|
-
protocol: "
|
|
139
|
+
protocol: "udp" | "tcp" | "http" | "grpc";
|
|
140
140
|
port?: number | undefined;
|
|
141
141
|
portnum?: number | undefined;
|
|
142
142
|
}> | undefined;
|
|
@@ -175,7 +175,7 @@ export declare const AddDeployment: (ctx: SolutionJSONContext, dep: V3Deployment
|
|
|
175
175
|
ca?: string | undefined;
|
|
176
176
|
value?: string | undefined;
|
|
177
177
|
} | undefined;
|
|
178
|
-
format?: "
|
|
178
|
+
format?: "json" | "text" | "yaml" | undefined;
|
|
179
179
|
group?: number | undefined;
|
|
180
180
|
mode?: number | undefined;
|
|
181
181
|
path?: string | undefined;
|
|
@@ -187,13 +187,13 @@ export declare const AddDeployment: (ctx: SolutionJSONContext, dep: V3Deployment
|
|
|
187
187
|
} | undefined;
|
|
188
188
|
size?: {
|
|
189
189
|
cpu: {
|
|
190
|
-
kind: "
|
|
190
|
+
kind: "bandwidth" | "storage" | "cpu" | "ram";
|
|
191
191
|
size: number;
|
|
192
192
|
unit: string;
|
|
193
193
|
};
|
|
194
194
|
mincpu: number;
|
|
195
195
|
memory: {
|
|
196
|
-
kind: "
|
|
196
|
+
kind: "bandwidth" | "storage" | "cpu" | "ram";
|
|
197
197
|
size: number;
|
|
198
198
|
unit: string;
|
|
199
199
|
};
|
|
@@ -72,6 +72,7 @@ export async function GenDeployment(log, svcs, input, output) {
|
|
|
72
72
|
// Otherwise, we import everything up until the last slash of the package, which is the actual route
|
|
73
73
|
// to the artifact within the module
|
|
74
74
|
let artifactImport = undefined;
|
|
75
|
+
let isBuiltin = false;
|
|
75
76
|
const lastSlash = deploymentJson.artifact.ref.package.lastIndexOf("/");
|
|
76
77
|
if (deploymentJson.artifact.ref.package !== "") {
|
|
77
78
|
artifactImport =
|
|
@@ -81,14 +82,21 @@ export async function GenDeployment(log, svcs, input, output) {
|
|
|
81
82
|
"/" +
|
|
82
83
|
deploymentJson.artifact.ref.package;
|
|
83
84
|
}
|
|
85
|
+
else if (deploymentJson.artifact.ref.domain === "kumori" &&
|
|
86
|
+
deploymentJson.artifact.ref.module === "builtin") {
|
|
87
|
+
isBuiltin = true;
|
|
88
|
+
artifactImport = "kumori/builtin";
|
|
89
|
+
}
|
|
84
90
|
const imports = artifactImport ? [artifactImport] : [];
|
|
85
91
|
// Build the artifact name <package>.<name>
|
|
86
92
|
// Again, if the package is empty, we just need to use the name
|
|
87
|
-
|
|
93
|
+
let artifact = deploymentJson.artifact.ref.package !== ""
|
|
88
94
|
? deploymentJson.artifact.ref.package.substring(lastSlash + 1) +
|
|
89
95
|
"." +
|
|
90
96
|
deploymentJson.artifact.ref.name
|
|
91
97
|
: deploymentJson.artifact.ref.name;
|
|
98
|
+
if (isBuiltin)
|
|
99
|
+
artifact = "builtin." + deploymentJson.artifact.ref.name;
|
|
92
100
|
const resources = [];
|
|
93
101
|
Object.entries(deploymentJson.config.resource).forEach(([key, value]) => {
|
|
94
102
|
const resourceName = Object.entries(Object(value))[0][1];
|
|
@@ -147,6 +155,9 @@ export async function GenDeployment(log, svcs, input, output) {
|
|
|
147
155
|
if (deploymentJson.artifact.ref.kind === "component") {
|
|
148
156
|
scaleValue = Object(deploymentJson.config.scale).hsize;
|
|
149
157
|
}
|
|
158
|
+
else if (isBuiltin) {
|
|
159
|
+
scaleValue = 1;
|
|
160
|
+
}
|
|
150
161
|
else {
|
|
151
162
|
Object.entries(deploymentJson.config.scale.detail)
|
|
152
163
|
.filter(([key]) => key !== "Inbound")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/deployment/gen/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,GAAG,EAAE,EAAE,EAAE,MAAM,iCAAiC,CAAA;AAEjE,OAAO,EAAyB,kBAAkB,EAAE,MAAM,eAAe,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,EACL,oBAAoB,GAErB,MAAM,qCAAqC,CAAA;AAE5C,OAAO,UAAU,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AAGjC,MAAM,OAAO,GAAG,0DAA0D,CAAA;AAC1E,MAAM,CAAC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;CAkB1B,CAAC,IAAI,EAAE,CAAA;AAER,eAAe,EAAE,QAAQ,EAAE,CAAA;AAC3B,MAAM,UAAU,QAAQ,CAAC,GAAY,EAAE,GAAc;IACnD,MAAM,CAAC,GAAG,GAAG;SACV,OAAO,CAAC,UAAU,CAAC;SACnB,KAAK,CAAC,KAAK,CAAC;SACZ,QAAQ,CACP,SAAS,EACT,qCAAqC,EACrC,wBAAwB,CACzB;SACA,QAAQ,CACP,UAAU,EACV,0CAA0C,EAC1C,6BAA6B,CAC9B;SACA,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,WAAW,CAAC;SACxB,UAAU,CAAC,IAAI,CAAC;SAChB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;IACtB,OAAO,CAAC,CAAA;AACV,CAAC;AAID,MAAM,UAAU,MAAM,CAAC,GAAc;IACnC,OAAO,KAAK,EACV,KAAK,GAAG,wBAAwB,EAChC,MAAM,GAAG,6BAA6B,EACtC,EAAE;QACF,MAAM,IAAI,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC,MAAM,CAAA;QACxD,MAAM,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;IAC/C,CAAC,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,GAAc,EACd,IAAoB,EACpB,KAAa,EACb,MAAc;IAEd,sBAAsB;IACtB,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAA;IACnD,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACzC,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAA;IACtD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,yBAAyB,KAAK,WAAW,CAAC,EAAE,CAAC,CAAA;QACvD,OAAO,GAAG,CAAC,CAAC,yBAAyB,KAAK,WAAW,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5D,CAAC;IAED,iBAAiB;IACjB,IAAI,cAA8B,CAAA;IAClC,IAAI,CAAC;QACH,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACxC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,yCAAyC,KAAK,WAAW,CAAC,EAAE,CAAC,CAAA;QACvE,OAAO,GAAG,CAAC,CAAC,yCAAyC,KAAK,WAAW,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAA;IAChC,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,UAAU,CAAA;IAEnD,2EAA2E;IAC3E,oGAAoG;IACpG,oCAAoC;IACpC,IAAI,cAAc,GAAG,SAAS,CAAA;IAC9B,MAAM,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACtE,IAAI,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,KAAK,EAAE,EAAE,CAAC;QAC/C,cAAc;YACZ,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM;gBAClC,GAAG;gBACH,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM;gBAClC,GAAG;gBACH,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAA;IACvC,CAAC;IACD,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEtD,2CAA2C;IAC3C,+DAA+D;IAC/D,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/deployment/gen/main.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/io/lib.kumori
CHANGED
package/out/lib/io/lib.kumori
CHANGED