feat: update to spago@next

Author: srghma

bower.json

@@ -1,8 +1,16 @@
 const fs = require("fs");
-const { htmlProps, svgProps, voids, types, typesByElement, reserved } = require("./consts");
-const changeCase = require('change-case')
+const {
+  htmlProps,
+  svgProps,
+  voids,
+  types,
+  typesByElement,
+  reserved
+} = require("./consts");
+const changeCase = require("change-case");
 const htmlGenFile = "../src/React/Basic/DOM/Generated.purs";
-const htmlSimplifiedGenFile = "../src/React/Basic/DOM/Simplified/Generated.purs";
+const htmlSimplifiedGenFile =
+  "../src/React/Basic/DOM/Simplified/Generated.purs";
 const svgGenFile = "../src/React/Basic/DOM/SVG.purs";
 
 const warningHeader = `-- | ------------------------------------------------------------
@@ -55,7 +63,7 @@ const propType = (e, p) => {
   } else {
     return types[p] || "String";
   }
-}
+};
 
 const svgHeader = `${warningHeader}
 module React.Basic.DOM.SVG where
@@ -65,29 +73,45 @@ import Effect.Unsafe (unsafePerformEffect)
 import Foreign.Object (Object)
 import Prim.Row (class Union)
 import React.Basic (JSX, ReactComponent, Ref, element)
-import React.Basic.DOM.Internal (SharedSVGProps, unsafeCreateDOMComponent)
+import React.Basic.DOM.Internal (SharedSVGProps, unsafeCreateDOMComponent, CSS)
 import Unsafe.Coerce (unsafeCoerce)
 import Web.DOM (Node)
 
 `;
 
 const ignoredSvgPropKeys = [
-  '*', 'elements',
+  "*",
+  "elements",
   // These are all deprecated according to MDN, and I'm not sure what the
   // React representation should be for the hyphenated ones if they are
   // supported all, so let's exclude them
-  "font", "glyph", "hkern", "missing-glyph", "vkern",
-  "font-face", "font-face-format", "font-face-name", "font-face-src", "font-face-uri",
-  "altGlyph", "altGlyphDef", "altGlyphItem", "glyphRef",
-  "tref", "color-profile", "cursor",
-]
-
-const camelCaseSvgProps = {}
-Object.keys(svgProps).forEach(elName => {
+  "font",
+  "glyph",
+  "hkern",
+  "missing-glyph",
+  "vkern",
+  "font-face",
+  "font-face-format",
+  "font-face-name",
+  "font-face-src",
+  "font-face-uri",
+  "altGlyph",
+  "altGlyphDef",
+  "altGlyphItem",
+  "glyphRef",
+  "tref",
+  "color-profile",
+  "cursor"
+];
+
+console.log(svgProps);
+const camelCaseSvgProps = {};
+Object.keys(svgProps).forEach((elName) => {
   if (!ignoredSvgPropKeys.includes(elName)) {
-    const elAttrs = svgProps[elName].map(changeCase.camelCase);
+    console.log(svgProps[elName]);
+    const elAttrs = svgProps[elName]["*"].map(changeCase.camelCase);
     // style is already included in SharedSVGProps
-    delete elAttrs['style'];
+    delete elAttrs["style"];
     camelCaseSvgProps[elName] = elAttrs;
   }
 });
@@ -101,25 +125,26 @@ delete htmlProps["svg"];
 const printRecord = (e, elProps) =>
   elProps.length
     ? `
-  ( ${elProps.map(p => `${p} :: ${propType(e, p)}`).join("\n  , ")}
+  ( ${elProps.map((p) => `${p} :: ${propType(e, p)}`).join("\n  , ")}
   )`
     : "()";
 
 const reactProps = ["ref", "key", "_data", "_aria"];
 
 const generatePropTypes = (elements, props, sharedPropType) =>
-  elements.map(e => {
-    const noChildren = voids.includes(e);
-    const symbol = reserved.includes(e) ? `${e}'` : e;
-
-    const propType = sharedPropType ? `(${sharedPropType} Props_${e})` : `Props_${e}`
-
-    return `
-    type Props_${e} =${printRecord(e,
-      ( noChildren
-        ? reactProps
-        : reactProps.concat("children")
-      )
+  elements
+    .map((e) => {
+      const noChildren = voids.includes(e);
+      const symbol = reserved.includes(e) ? `${e}'` : e;
+
+      const propType = sharedPropType
+        ? `(${sharedPropType} Props_${e})`
+        : `Props_${e}`;
+
+      return `
+    type Props_${e} =${printRecord(
+      e,
+      (noChildren ? reactProps : reactProps.concat("children"))
         .concat(props[e] || [], props["*"] || [])
         .sort()
     )}
@@ -148,20 +173,27 @@ const generatePropTypes = (elements, props, sharedPropType) =>
       :: ReactComponent (Record ${propType})
     _${e}' = unsafePerformEffect (unsafeCreateDOMComponent "${e}")
 `;
-  }).map(x => x.replace(/^\n\ {4}/, "").replace(/\n\ {4}/g, "\n"))
-  .join("\n");
-
-  const generateSimplifiedPropTypes = (elements, props, sharedPropType) =>
-  elements.map(e => {
-    const noChildren = voids.includes(e);
-    const symbol = reserved.includes(e) ? `${e}'` : e;
-
-    const propType = sharedPropType ? `(${sharedPropType} Props_${e})` : `Props_${e}`
-
-    return noChildren ? `` : `
-    type Props_${e} =${printRecord(e,
-      ( reactProps.concat("children")
-      )
+    })
+    .map((x) => x.replace(/^\n\ {4}/, "").replace(/\n\ {4}/g, "\n"))
+    .join("\n");
+
+const generateSimplifiedPropTypes = (elements, props, sharedPropType) =>
+  elements
+    .map((e) => {
+      const noChildren = voids.includes(e);
+      const symbol = reserved.includes(e) ? `${e}'` : e;
+
+      const propType = sharedPropType
+        ? `(${sharedPropType} Props_${e})`
+        : `Props_${e}`;
+
+      return noChildren
+        ? ``
+        : `
+    type Props_${e} =${printRecord(
+      e,
+      reactProps
+        .concat("children")
         .concat(props[e] || [], props["*"] || [])
         .sort()
     )}
@@ -194,20 +226,36 @@ const generatePropTypes = (elements, props, sharedPropType) =>
     _internal${symbol}' = unsafePerformEffect (unsafeCreateDOMComponent "${symbol}")
 
 `;
-  }).map(x => x.replace(/^\n\ {4}/, "").replace(/\n\ {4}/g, "\n"))
-  .join("\n");
-
-const htmlTagTypes = generatePropTypes(htmlProps.elements.html, htmlProps, null);
-const htmlSimplifiedTagTypes = generateSimplifiedPropTypes(htmlProps.elements.html, htmlProps, null);
-const svgTagTypes = generatePropTypes(Object.keys(camelCaseSvgProps), camelCaseSvgProps, 'SharedSVGProps');
+    })
+    .map((x) => x.replace(/^\n\ {4}/, "").replace(/\n\ {4}/g, "\n"))
+    .join("\n");
+
+const htmlTagTypes = generatePropTypes(
+  htmlProps.elements.html,
+  htmlProps,
+  null
+);
+const htmlSimplifiedTagTypes = generateSimplifiedPropTypes(
+  htmlProps.elements.html,
+  htmlProps,
+  null
+);
+const svgTagTypes = generatePropTypes(
+  Object.keys(camelCaseSvgProps),
+  camelCaseSvgProps,
+  "SharedSVGProps"
+);
 
 console.log(`Writing "${htmlGenFile}" ...`);
 fs.writeFileSync(htmlGenFile, htmlHeader + htmlTagTypes);
 
 console.log(`Writing "${htmlSimplifiedGenFile}" ...`);
-fs.writeFileSync(htmlSimplifiedGenFile, simplifiedHtmlHeader + htmlSimplifiedTagTypes);
+fs.writeFileSync(
+  htmlSimplifiedGenFile,
+  simplifiedHtmlHeader + htmlSimplifiedTagTypes
+);
 
 console.log(`Writing "${svgGenFile}" ...`);
 fs.writeFileSync(svgGenFile, svgHeader + svgTagTypes);
 
-console.log("Done.");
+console.log("Done.");

codegen/index.js

@@ -6,7 +6,7 @@
   "author": "",
   "dependencies": {
     "react-html-attributes": "^1.4.6",
-    "change-case": "^3.1.0",
-    "svg-element-attributes": "^1.3.0"
+    "change-case": "^5.4.4",
+    "svg-element-attributes": "^2.1.0"
   }
 }

codegen/package.json

@@ -31,4 +31,4 @@
         };
       }
     );
-}
+}