superglue 2.0.0.alpha.10 → 2.0.0.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa419e7869dd82d8ca911e9d769008878ff2f067c1f0acf04fce9a5634f12ef
-  data.tar.gz: b9dc1c99d956a04699e96c3a297f5eb21f90621c71c56c2379da1b189ca745bc
+  metadata.gz: b1527733a6372de0c0ec7d25718e65f2461b5d50ab16cbb54fa7b37a46d6a485
+  data.tar.gz: b22b3698f31b77ce9b67bda5789f39f617f14abc8dbef550dec67b15355b530d
 SHA512:
-  metadata.gz: 7653b40c3ba33e5c29b1f081d25ae4c18add19a8556411cff8d43f4787895baf368d99f193e7e9cc9137bf56de85d1e6918dded3abf2e0c0d9bba4e668c9f6fd
-  data.tar.gz: bad535629a057d095e6da5b394c32fcfe46c1068cc9e5f89879e351fde17d9467c88fc85c2b9f832f50f6714ecdd28ec0d8f13706df5c7425d86db7111f7561c
+  metadata.gz: 60cd812d8228c56b0f5d86b2bc7c42d0f57d9f27d6d601efa9f50a8221049f63b560322c7790bb6a5c76bf1dd15e98038c8d498969e1f2a076965443144a939c
+  data.tar.gz: c9a3d065a75ead8c7055bd77d68ee829ea7602b83fefbdcd55c106b9161f318e106b423a498ba4d21c058ce1580215ba255fd188f48777a35eaa23699d39579f

data/lib/generators/superglue/install/install_generator.rb

@@ -43,7 +43,7 @@ module Superglue
         run "yarn add react react-dom @reduxjs/toolkit react-redux @thoughtbot/superglue@2.0.0-alpha.8"
 
         if use_typescript
-          run "yarn add -D @types/react-dom @types/react @types/node @thoughtbot/candy_wrapper@0.0.4"
+          run "yarn add -D @types/react-dom @types/react @types/node @deepkit/type @deepkit/core @deepkit/type-compiler @thoughtbot/candy_wrapper@0.0.4 typescript"
         end
 
         say "Superglue is Installed! 🎉", :green
@@ -113,6 +113,12 @@ module Superglue
 
         say "Copying tsconfig.json file to #{app_js_path}"
         copy_file "#{__dir__}/templates/ts/tsconfig.json", "tsconfig.json"
+
+        say "Copying esbuild plugin for Deepkit"
+        copy_file "#{__dir__}/templates/esbuild/plugin.js", "deepkit.mjs"
+
+        say "Adding build.mjs for TypeScript compilation"
+        copy_file "#{__dir__}/templates/ts/build.mjs", "build.mjs"
       end
 
       def copy_js_files
@@ -138,6 +144,9 @@ module Superglue
 
         say "Copying jsconfig.json file to #{app_js_path}"
         copy_file "#{__dir__}/templates/js/jsconfig.json", "jsconfig.json"
+
+        say "Adding build.mjs for TypeScript compilation"
+        copy_file "#{__dir__}/templates/js/build.mjs", "build.mjs"
       end
 
       def add_member_methods

data/lib/generators/superglue/install/templates/esbuild/plugin.js

@@ -0,0 +1,43 @@
+import * as ts from "typescript";
+import { cwd } from "process";
+import { declarationTransformer, transformer } from "@deepkit/type-compiler";
+import { readFile } from "fs/promises";
+
+export default function deepkitType(options = {}){
+  return {
+    name: "Deepkit",
+    setup(build) {
+      const transformers = options.transformers || {
+        before: [transformer],
+        after: [declarationTransformer],
+      };
+
+      build.onLoad({ filter: /\.tsx?$/ }, async (args) => {
+        const configFilePath = options.tsConfig || cwd() + "/tsconfig.json";
+
+        const code = await readFile(args.path, { encoding: 'utf8' });
+        const transformed = ts.transpileModule(code, {
+          compilerOptions: Object.assign(
+            {
+              target: ts.ScriptTarget.ESNext,
+              module: ts.ModuleKind.ESNext,
+              sourceMap: false,
+              skipDefaultLibCheck: true,
+              skipLibCheck: true,
+              configFilePath,
+            },
+            options || {},
+          ),
+          fileName: args.path,
+          moduleName: args.namespace,
+          transformers,
+        });
+
+        return {
+          contents: transformed.outputText,
+          loader: args.path.endsWith('.tsx') ? 'tsx' : 'ts'
+        };
+      });
+    },
+  };
+}

data/lib/generators/superglue/install/templates/js/build.mjs

@@ -0,0 +1,26 @@
+import * as esbuild from 'esbuild'
+
+const isWatch = process.argv.includes('--watch')
+
+const buildOptions = {
+  entryPoints: [
+    'app/javascript/application.jsx',
+  ],
+  bundle: true,
+  sourcemap: true,
+  format: 'esm',
+  outdir: 'app/assets/builds',
+  publicPath: '/assets',
+  plugins:  process.env.NODE_ENV === 'production' ? [] : [] ,
+  metafile: true,
+  conditions: process.env.NODE_ENV === 'production' ? ['production'] : [],
+}
+
+if (isWatch) {
+  const ctx = await esbuild.context(buildOptions)
+  await ctx.watch()
+  console.log('Watching for changes...')
+} else {
+  const result = await esbuild.build(buildOptions)
+  console.log(await esbuild.analyzeMetafile(result.metafile))
+}

data/lib/generators/superglue/install/templates/ts/build.mjs

@@ -0,0 +1,27 @@
+import * as esbuild from 'esbuild'
+import deepkitType from './deepkit.mjs'
+
+const isWatch = process.argv.includes('--watch')
+
+const buildOptions = {
+  entryPoints: [
+    'app/javascript/application.tsx',
+  ],
+  bundle: true,
+  sourcemap: true,
+  format: 'esm',
+  outdir: 'app/assets/builds',
+  publicPath: '/assets',
+  plugins:  process.env.NODE_ENV === 'production' ? [] : [deepkitType()] ,
+  metafile: true,
+  conditions: process.env.NODE_ENV === 'production' ? ['production'] : [],
+}
+
+if (isWatch) {
+  const ctx = await esbuild.context(buildOptions)
+  await ctx.watch()
+  console.log('Watching for changes...')
+} else {
+  const result = await esbuild.build(buildOptions)
+  console.log(await esbuild.analyzeMetafile(result.metafile))
+}

data/lib/generators/superglue/install/templates/ts/page_to_page_mapping.ts

@@ -28,6 +28,8 @@
 // }
 // ```
 //
-const pageIdentifierToPageComponent = {};
+const pageIdentifierToPageComponent = {
+  // Add your mappings here
+};
 
 export { pageIdentifierToPageComponent };

data/lib/generators/superglue/install/templates/ts/tsconfig.json

@@ -7,7 +7,7 @@
     "strictPropertyInitialization": false,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "jsx": "react",
+    "jsx": "preserve",
     "allowJs": false,
     "target": "ES2021",
     "allowSyntheticDefaultImports": true,
@@ -24,4 +24,5 @@
     "app/javascript/**/*",
     "app/views/**/*"
   ],
+  "reflection": true
 }

data/lib/generators/superglue/view_collection/templates/ts/new.tsx

@@ -17,7 +17,7 @@ type ContentProps = {
   <%= js_plural_table_name %>Path: string
   <%= js_singular_table_name %>Form: FormProps<{
     <%- attributes.each do |attr| -%>
-    <%= attr.column_name.camelize(:lower)%>: <%= Railsjs_component(attr)%>Props
+    <%= attr.column_name.camelize(:lower)%>: Rails<%= js_component(attr)%>Props
     <%- end -%>
     submit: RailsSubmitButtonProps
   }>

data/lib/superglue/rendering.rb

@@ -25,14 +25,24 @@ module Superglue
         end
 
         @_render_options = options
-        _ensure_react_page!(options[:template], options[:prefixes])
+        _ensure_react_page!(options[:template], options[:prefixes]) if request.format.html?
 
-        html_template_exist = template_exists?(options[:template], options[:prefixes], false)
-        if !html_template_exist
+        target_template_exists = template_exists?(options[:template], options[:prefixes], false)
+
+        if request.format.html? && !target_template_exists
+          # this uses the default superglue html template, which is super basic so
+          # we don't' need to create a separate one for each view
           super(options.merge(
             template: _superglue_template,
             prefixes: []
           ))
+        elsif request.format.json? && !target_template_exists
+          # This fixes an issue with rendering json direclty but teh template doesn't exist
+          # we still want ot see the layout rendered
+          super(options.merge(
+            inline: "",
+            layout: _layout_for_option(true)
+          ))
         else
           super
         end
@@ -54,7 +64,11 @@ module Superglue
     end
 
     def _jsx_defaults
-      @_use_jsx_rendering_defaults && request.format.html?
+      @_use_jsx_rendering_defaults && (request.format.html? || request.format.json?)
+    end
+
+    def _props_defaults
+      @_use_jsx_rendering_defaults && request.format.json?
     end
 
     def _ensure_react_page!(template, prefixes)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superglue
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.10
+  version: 2.0.0.alpha.11
 platform: ruby
 authors:
 - Johny Ho
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: form_props
   requirement: !ruby/object:Gem::Requirement
@@ -79,9 +79,11 @@ files:
 - lib/generators/superglue/install/install_generator.rb
 - lib/generators/superglue/install/templates/application.json.props
 - lib/generators/superglue/install/templates/erb/superglue.html.erb
+- lib/generators/superglue/install/templates/esbuild/plugin.js
 - lib/generators/superglue/install/templates/initializer.rb
 - lib/generators/superglue/install/templates/js/application.jsx
 - lib/generators/superglue/install/templates/js/application_visit.js
+- lib/generators/superglue/install/templates/js/build.mjs
 - lib/generators/superglue/install/templates/js/components.js
 - lib/generators/superglue/install/templates/js/flash.js
 - lib/generators/superglue/install/templates/js/inputs.jsx
@@ -92,6 +94,7 @@ files:
 - lib/generators/superglue/install/templates/stream.json.props
 - lib/generators/superglue/install/templates/ts/application.tsx
 - lib/generators/superglue/install/templates/ts/application_visit.ts
+- lib/generators/superglue/install/templates/ts/build.mjs
 - lib/generators/superglue/install/templates/ts/components.ts
 - lib/generators/superglue/install/templates/ts/flash.ts
 - lib/generators/superglue/install/templates/ts/inputs.tsx