fix: common code issues resolved

Author: vip-git

scripts/generator/frameworks/react-native/rnpaper/components.json

@@ -59,7 +59,7 @@
             "type": "string",
             "hasDist": true,
             "isEnum": false,
-            "name": "material-slider"
+            "name": "material-switch"
         },
         "@react-native-jsonschema-form-components/material-input": {
             "version": "0.0.1",

scripts/generator/index.js

@@ -23,7 +23,7 @@
 const ejs = require('ejs');
 const shelljs = require('shelljs');
 
-const componentSettings = require(`./frameworks/${process.env.FRAMEWORK_NAME}/${process.env.UI_FRAMEWORK_NAME}/components.json`);
+const componentSettings = require(`./frameworks/${process.env.COMPONENTS_FRAMEWORK_NAME}/${process.env.UI_FRAMEWORK_NAME}/components.json`);
 
 // Config
 const { CONFIG, folderHashMapping } = require('./config');

scripts/generator/modules-generator.js

@@ -21,11 +21,25 @@ const moduleGenerator = (
         `npm install ${modName}@${componentSettings[moduleName][modName].version} --save-exact`,
       );
     });
-  shelljs.cp(
-    '-R',
-    `node_modules/@react-jsonschema-form-${moduleName}/`,
-    `${generatedLocation}/${moduleName}`,
-  );
+  if (moduleName === 'interceptors') {
+    shelljs.cp(
+      '-R',
+      `node_modules/@${process.env.INTERCEPTORS_FRAMEWORK_NAME}-jsonschema-form-${moduleName}/`,
+      `${generatedLocation}/${moduleName}`,
+    );
+  } else if(moduleName === 'utils') {
+    shelljs.cp(
+      '-R',
+      `node_modules/@${process.env.UTILS_FRAMEWORK_NAME}-jsonschema-form-${moduleName}/`,
+      `${generatedLocation}/${moduleName}`,
+    );
+  } else {
+    shelljs.cp(
+      '-R',
+      `node_modules/@${process.env.COMPONENTS_FRAMEWORK_NAME}-jsonschema-form-${moduleName}/`,
+      `${generatedLocation}/${moduleName}`,
+    );
+  }
 
   Object.keys(componentSettings[moduleName])
     .filter((c) => !componentSettings[moduleName][c].notAvailable)

scripts/generator/package-lock.json

@@ -14,6 +14,12 @@
     "@react-jsonschema-form-interceptors/translate-range-date": "2.0.0",
     "@react-jsonschema-form-interceptors/translate-ratings": "2.0.0",
     "@react-jsonschema-form-utils/enum-utils": "2.0.1",
-    "@react-jsonschema-form-utils/parse-values": "2.0.1"
+    "@react-jsonschema-form-utils/parse-values": "2.0.1",
+    "@react-native-jsonschema-form-components/empty-div": "0.0.1",
+    "@react-native-jsonschema-form-components/material-checkbox": "0.0.1",
+    "@react-native-jsonschema-form-components/material-input": "0.0.1",
+    "@react-native-jsonschema-form-components/material-radio-group": "0.0.1",
+    "@react-native-jsonschema-form-components/material-select": "0.0.1",
+    "@react-native-jsonschema-form-components/material-switch": "0.0.1"
   }
 }

scripts/generator/package.json

@@ -3,6 +3,8 @@ const frameworkGenerator = ({
     frameworkName, 
     uiFrameworkName,
     uiFrameworkTemplate,
+    interceptorFrameworkName,
+    utilsFrameworkName
 }) => {
     const frameworkDir = `${shelljs.pwd()}/src/framework`;
     const helpersDir = `${shelljs.pwd()}/scripts/installer/frameworks/${frameworkName}/helpers`;
@@ -50,7 +52,7 @@ const frameworkGenerator = ({
     shellFileString.to(`${shelljs.pwd()}/src/framework/ui-framework/index.ts`);
     shelljs.mv(`${shelljs.pwd()}/package.json`, `${shelljs.pwd()}/package-original.json`);
     shelljs.cp(reactMUIPackageJson, `${shelljs.pwd()}/package.json`);
-    shelljs.exec(`cross-env FRAMEWORK_NAME=${frameworkName} UI_FRAMEWORK_NAME=${uiFrameworkName} npm install`);
+    shelljs.exec(`cross-env INTERCEPTORS_FRAMEWORK_NAME=${interceptorFrameworkName} UTILS_FRAMEWORK_NAME=${utilsFrameworkName} COMPONENTS_FRAMEWORK_NAME=${frameworkName} UI_FRAMEWORK_NAME=${uiFrameworkName} npm install`);
     shelljs.rm('-rf', `${shelljs.pwd()}/package.json`);
     shelljs.mv(`${shelljs.pwd()}/package-original.json`, `${shelljs.pwd()}/package.json`);
 }

scripts/installer/framework-generator.ts

@@ -26,7 +26,9 @@ if (process.argv && process.argv.length === 3) {
                 shelljs,
                 frameworkName: 'react',
                 uiFrameworkName: 'mui',
-                uiFrameworkTemplate: reactUIFrameworkTemplate
+                uiFrameworkTemplate: reactUIFrameworkTemplate,
+                interceptorFrameworkName: 'react',
+                utilsFrameworkName: 'react'
             });
             break;
 
@@ -38,7 +40,9 @@ if (process.argv && process.argv.length === 3) {
                 shelljs,
                 frameworkName: 'vue',
                 uiFrameworkName: 'mui',
-                uiFrameworkTemplate: vueUIFrameworkTemplate
+                uiFrameworkTemplate: vueUIFrameworkTemplate,
+                interceptorFrameworkName: 'vue',
+                utilsFrameworkName: 'vue'
             });
             break;
 
@@ -50,7 +54,9 @@ if (process.argv && process.argv.length === 3) {
                 shelljs,
                 frameworkName: 'react-native',
                 uiFrameworkName: 'rnpaper',
-                uiFrameworkTemplate: rnUIFrameworkTemplate
+                uiFrameworkTemplate: rnUIFrameworkTemplate,
+                interceptorFrameworkName: 'react',
+                utilsFrameworkName: 'react'
             });
             //shelljs.rm('-rf', `${shelljs.pwd()}/scripts/installer/frameworks/react-native/cross-framework-wrapper/react/form-styles.ts`);
             //shelljs.rm('-rf', `${shelljs.pwd()}/scripts/installer/frameworks/react-native/cross-framework-wrapper/react/form-field-styles.ts`);
@@ -64,7 +70,9 @@ if (process.argv && process.argv.length === 3) {
                 shelljs,
                 frameworkName: 'angular',
                 uiFrameworkName: 'mui',
-                uiFrameworkTemplate: angularUIFrameworkTemplate
+                uiFrameworkTemplate: angularUIFrameworkTemplate,
+                interceptorFrameworkName: 'angular',
+                utilsFrameworkName: 'angular'
             });
             break;
 
@@ -76,7 +84,9 @@ if (process.argv && process.argv.length === 3) {
                 shelljs,
                 frameworkName: 'stencil',
                 uiFrameworkName: 'mui',
-                uiFrameworkTemplate: stencilUIFrameworkTemplate
+                uiFrameworkTemplate: stencilUIFrameworkTemplate,
+                interceptorFrameworkName: 'stencil',
+                utilsFrameworkName: 'stencil'
             });
             break;
 
@@ -88,7 +98,9 @@ if (process.argv && process.argv.length === 3) {
                 shelljs,
                 frameworkName: 'svelte',
                 uiFrameworkName: 'mui',
-                uiFrameworkTemplate: svelteUIFrameworkTemplate
+                uiFrameworkTemplate: svelteUIFrameworkTemplate,
+                interceptorFrameworkName: 'svelte',
+                utilsFrameworkName: 'svelte'
             });
             break;