@weclapp/sdk 2.0.0-dev.31 → 2.0.0-dev.32

package/dist/cli.js

@@ -1050,7 +1050,7 @@ const generateEntityProperties = (entities, aliases, services, options) => {
     const typeName = 'WEntityProperties';
     const propertyMap = [
         ...entities.entries(),
-        ...aliases.entries().map(([service, type]) => [service, entities.get(camelCase(type))])
+        ...[...aliases.entries()].map(([service, type]) => [service, entities.get(camelCase(type))])
     ].map(([entity, data]) => ({
         key: entity,
         value: generatePropertyDescriptors(data, entities, services, options)
@@ -1104,12 +1104,9 @@ const generateGroupedServices = (services) => {
 };
 
 const generateMaps = (enums, entities, services, aliases, options) => {
-    const enumInstances = `export const wEnums = ${generateObject(enums
-        .keys()
-        .toArray()
-        .map((v) => ({ key: v, value: v })))};`;
-    const entityNames = `export const wEntityNames: WEntity[] = ${generateArray(entities.keys().toArray())};`;
-    const generatedServices = services.values().toArray();
+    const enumInstances = `export const wEnums = ${generateObject([...enums.keys()].map((v) => ({ key: v, value: v })))};`;
+    const entityNames = `export const wEntityNames: WEntity[] = ${generateArray([...entities.keys()])};`;
+    const generatedServices = [...services.values()];
     const serviceInstances = `export const wServices = ${generateObject(generatedServices.map((v) => ({
         key: v.name,
         value: `${v.serviceFnName}()`,
@@ -1123,14 +1120,11 @@ const generateMaps = (enums, entities, services, aliases, options) => {
     return {
         source: generateStatements(
         /* Enums */
-        generateInterface('WEnums', enums
-            .keys()
-            .toArray()
-            .map((name) => ({ name, type: name, required: true }))), generateType('WEnum', 'keyof WEnums'), enumInstances, 
+        generateInterface('WEnums', [...enums.keys()].map((name) => ({ name, type: name, required: true }))), generateType('WEnum', 'keyof WEnums'), enumInstances, 
         /* Entities */
         generateInterface('WEntities', [
-            ...entities.keys().map((name) => ({ name, type: loosePascalCase(name), required: true })),
-            ...aliases.entries().map(([name, type]) => ({ name, type, required: true }))
+            ...[...entities.keys()].map((name) => ({ name, type: loosePascalCase(name), required: true })),
+            ...[...aliases.entries()].map(([name, type]) => ({ name, type, required: true }))
         ].sort((a, b) => (a.name > b.name ? 1 : -1))), generateType('WEntity', 'keyof WEntities'), entityNames, 
         /* Services */
         serviceInstances, generateType('WServices', 'typeof wServices'), generateType('WService', 'keyof WServices'), serviceFactories, generateType('WServiceFactories', 'typeof wServiceFactories'), 
@@ -1190,16 +1184,7 @@ const generate = (doc, options) => {
     const entities = generateEntities(schemas, enums);
     const services = generateServices(doc.paths, entities, aliases, options);
     const maps = generateMaps(enums, entities, services, aliases, options);
-    return generateStatements(generateBase(options.target, doc.info.version, options), generateBlockComment('ENUMS', generateStatements(...enums
-        .values()
-        .map((v) => v.source)
-        .toArray())), generateBlockComment('ENTITIES', generateStatements(...entities
-        .values()
-        .map((v) => v.source)
-        .toArray())), generateBlockComment('SERVICES', generateStatements(...services
-        .values()
-        .map((v) => v.source)
-        .toArray())), generateBlockComment('MAPS', generateStatements(maps.source)));
+    return generateStatements(generateBase(options.target, doc.info.version, options), generateBlockComment('ENUMS', generateStatements(...[...enums.values()].map((v) => v.source))), generateBlockComment('ENTITIES', generateStatements(...[...entities.values()].map((v) => v.source))), generateBlockComment('SERVICES', generateStatements(...[...services.values()].map((v) => v.source))), generateBlockComment('MAPS', generateStatements(maps.source)));
 };
 
 const hash = (content, algorithm = 'sha256') => {
@@ -1349,7 +1334,7 @@ void (async () => {
         logger.infoLn('Bundle... (this may take some time)');
         await bundle(workingDir, options.target);
         // Remove index.ts (only bundle is required)
-        // await rm(await workingDirPath('src'), { recursive: true, force: true });
+        await rm(await workingDirPath('src'), { recursive: true, force: true });
         if (useCache) {
             // Copy SDK to cache
             logger.successLn(`Caching SDK: (${cachedSdkDir})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weclapp/sdk",
-  "version": "2.0.0-dev.31",
+  "version": "2.0.0-dev.32",
   "description": "SDK generator based on a weclapp api swagger file",
   "author": "weclapp",
   "sideEffects": false,