foobara-typescript-remote-command-generator 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69bd175fc5eecad6f5b353135377fcf15d164fa659e2ca130f641853f4b3c5e3
-  data.tar.gz: 38b135625b70aa997cd0744a5b7f1be524212a3257f61f108ed79ee29df6f85d
+  metadata.gz: 0a7d35269e0cccd832d9f2273e87df63886b43653f8f3188c835f3d98b57bbb6
+  data.tar.gz: 2a28d7e124c91342b41f598e2d83fde63f9a6d1a4a882d8865b68da39763773b
 SHA512:
-  metadata.gz: 163591e591ca0094197ee34e5ad97b4ffde5f8ac122cbbeeb3d10fd460035607c32108935f6d144459d8442bfaac9dafe3fd4283753cf8a1c20d2786d1168fcc
-  data.tar.gz: 9af4d1233e5c649b8e8ced9a6063c9ba1dafb729279308b49bedb570e6ee996aa81feb55e9bd5e313e8a389ad679ea0c89be71024c8e4fc55f6f9e45758e8905
+  metadata.gz: 221ffce09538be115791fd15ef205a4d381828974a8076fd693db489a749598edcdf68c5faafe21f570830c73f8ff3fb838af3b4a9c388ccf665282b6ce41952
+  data.tar.gz: e3a47338014c6d6f819c6ac9e1b6269558cf2955ae1d4a709a4c000d03029de634617683566c3f6a6d3f3a056add55fc4ff8a039e4acb4115b4f13a6fbdb4780

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.0.5] - 2024-08-23
+
+- Fix several naming/import issues in templates
+
 ## [0.0.4] - 2024-08-22
 
 - Add type generators to command result generator

data/src/remote_generator/services/aggregate_model_generator.rb

@@ -38,11 +38,6 @@ module Foobara
           aggregate_attributes_ts_type
         end
 
-        def ts_instance_path
-          *prefix, name = scoped_path
-          [*prefix, "#{name}Aggregate"]
-        end
-
         def ts_instance_full_path
           *prefix, name = scoped_full_path
           [*prefix, "#{name}Aggregate"]

data/src/remote_generator/services/atom_model_generator.rb

@@ -34,11 +34,6 @@ module Foobara
           end
         end
 
-        def ts_instance_path
-          *prefix, name = scoped_path
-          [*prefix, "#{name}Atom"]
-        end
-
         def ts_instance_full_path
           *prefix, name = scoped_full_path
           [*prefix, "#{name}Atom"]

data/src/remote_generator/services/type_generator.rb

@@ -103,7 +103,7 @@ module Foobara
         end
 
         def type_name_downcase
-          type_name[0].downcase + type_name[1..]
+          type_short_name[0].downcase + type_short_name[1..]
         end
 
         def attributes_type_ts_type

data/src/remote_generator/services/typescript_from_manifest_base_generator.rb

@@ -117,10 +117,6 @@ module Foobara
           dependency_group.non_colliding_dependency_roots.sort_by(&:scoped_full_name)
         end
 
-        def ts_instance_name
-          ts_instance_path.join(".")
-        end
-
         def ts_instance_path
           scoped_path
         end

data/src/remote_generator/services/unloaded_entity_generator.rb

@@ -10,11 +10,6 @@ module Foobara
           ["Entity", "Unloaded.ts.erb"]
         end
 
-        def ts_instance_path
-          *prefix, name = super
-          [*prefix, "Unloaded#{name}"]
-        end
-
         def ts_instance_full_path
           *prefix, name = super
           [*prefix, "Unloaded#{name}"]

data/templates/Command/Result.ts.erb

@@ -1,5 +1,5 @@
 <% dependency_roots.each do |dependency_root| %>
-import { <%= dependency_root.ts_instance_name %> } from "<%= path_to_root %><%= dependency_root.import_path %>"
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
 type Result = <%= foobara_type_to_ts_type(result_type, dependency_group:, association_depth:) %>

data/templates/Entity/Aggregate.ts.erb

@@ -1,14 +1,14 @@
 import {
-  <%= entity_name %>AttributesType
+  <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
-import { Loaded<%= entity_name %> } from "./Loaded"
+import { Loaded<%= entity_short_name %> } from "./Loaded"
 <% dependency_roots.each do |dependency_root| %>
-import { <%= dependency_root.ts_instance_name %> } from "<%= path_to_root %><%= dependency_root.import_path %>"
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
-export interface <%= entity_name %>AggregateAttributesType extends <%= entity_name %>AttributesType <%= attributes_type_ts_type %>
+export interface <%= entity_short_name %>AggregateAttributesType extends <%= entity_short_name %>AttributesType <%= attributes_type_ts_type %>
 
-export class <%= entity_name %>Aggregate extends Loaded<%= entity_name %><<%= entity_name %>AggregateAttributesType> {
+export class <%= entity_short_name %>Aggregate extends Loaded<%= entity_short_name %><<%= entity_short_name %>AggregateAttributesType> {
   <% if has_associations? %>
   /* eslint-disable @typescript-eslint/class-literal-property-style */
   get isAtom (): false { return false }

data/templates/Entity/Ambiguous.ts.erb

@@ -1,20 +1,20 @@
 import { Entity } from "<%= path_to_root %>base/Entity"
 <% dependency_roots.each do |dependency_root| %>
-import { <%= dependency_root.scoped_name %> } from "<%= path_to_root %><%= dependency_root.import_path %>"
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
-export type <%= entity_name %>PrimaryKeyType = <%= primary_key_ts_type %>
+export type <%= entity_short_name %>PrimaryKeyType = <%= primary_key_ts_type %>
 export const <%= entity_name_downcase %>PrimaryKeyAttributeName: "<%= primary_key_name %>" = "<%= primary_key_name %>"
-export interface <%= entity_name %>AttributesType <%= attributes_type_ts_type %>
+export interface <%= entity_short_name %>AttributesType <%= attributes_type_ts_type %>
 
-export class <%= entity_name %><
-  AttributesType extends <%= entity_name %>AttributesType = <%= entity_name %>AttributesType
-> extends Entity<<%= entity_name %>PrimaryKeyType, AttributesType> {
-  static readonly modelName: string = "<%= entity_name %>"
-  static readonly entityName: string = "<%= entity_name %>"
+export class <%= entity_short_name %><
+  AttributesType extends <%= entity_short_name %>AttributesType = <%= entity_short_name %>AttributesType
+> extends Entity<<%= entity_short_name %>PrimaryKeyType, AttributesType> {
+  static readonly modelName: string = "<%= entity_short_name %>"
+  static readonly entityName: string = "<%= entity_short_name %>"
   static readonly primaryKeyAttributeName: "<%= primary_key_name %>" = "<%= primary_key_name %>"
 
-  get <%= primary_key_name %> (): <%= entity_name %>PrimaryKeyType {
+  get <%= primary_key_name %> (): <%= entity_short_name %>PrimaryKeyType {
     return this.primaryKey
   }
 

data/templates/Entity/Atom.ts.erb

@@ -1,14 +1,14 @@
 import {
-  <%= entity_name %>AttributesType
+  <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
-import { Loaded<%= entity_name %> } from "./Loaded"
+import { Loaded<%= entity_short_name %> } from "./Loaded"
 <% dependency_roots.each do |dependency_root| %>
-import { <%= dependency_root.ts_instance_name %> } from "<%= path_to_root %><%= dependency_root.import_path %>"
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
-export interface <%= entity_name %>AtomAttributesType extends <%= entity_name %>AttributesType <%= atom_attributes_ts_type %>
+export interface <%= entity_short_name %>AtomAttributesType extends <%= entity_short_name %>AttributesType <%= atom_attributes_ts_type %>
 
-export class <%= entity_name %>Atom extends Loaded<%= entity_name %><<%= entity_name %>AtomAttributesType> {
+export class <%= entity_short_name %>Atom extends Loaded<%= entity_short_name %><<%= entity_short_name %>AtomAttributesType> {
   <% if has_associations? %>
   /* eslint-disable @typescript-eslint/class-literal-property-style */
   get isAtom (): true { return true }

data/templates/Entity/Loaded.ts.erb

@@ -1,9 +1,9 @@
 import {
-  <%= entity_name %>,
-  <%= entity_name %>AttributesType
+  <%= entity_short_name %>,
+  <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
 
-export class Loaded<%= entity_name %><T extends <%= entity_name %>AttributesType = <%= entity_name %>AttributesType> extends <%= entity_name %><T> {
+export class Loaded<%= entity_short_name %><T extends <%= entity_short_name %>AttributesType = <%= entity_short_name %>AttributesType> extends <%= entity_short_name %><T> {
   readonly isLoaded: true = true
   <% unless has_associations? %>
 /* eslint-disable @typescript-eslint/class-literal-property-style */

data/templates/Entity/Unloaded.ts.erb

@@ -1,15 +1,15 @@
 import { Never } from "<%= path_to_root %>base/Entity"
 import {
-  <%= entity_name %>,
-  //<%= entity_name %>PrimaryKeyType
-  <%= entity_name %>AttributesType
+  <%= entity_short_name %>,
+  //<%= entity_short_name %>PrimaryKeyType
+  <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
 
-export type Unloaded<%= entity_name %>AttributesType = Never<<%= entity_name %>AttributesType>
+export type Unloaded<%= entity_short_name %>AttributesType = Never<<%= entity_short_name %>AttributesType>
 
-export class Unloaded<%= entity_name %> extends <%= entity_name %><Unloaded<%= entity_name %>AttributesType> {
+export class Unloaded<%= entity_short_name %> extends <%= entity_short_name %><Unloaded<%= entity_short_name %>AttributesType> {
   /*
-  constructor(id: <%= entity_name %>PrimaryKeyType) {
+  constructor(id: <%= entity_short_name %>PrimaryKeyType) {
     super(id, {})
   }
   */

data/templates/EntityVariants.ts.erb

@@ -1,40 +1,40 @@
 import {
-  <%= entity_name %>,
-  <%= entity_name %>PrimaryKeyType,
+  <%= entity_short_name %>,
+  <%= entity_short_name %>PrimaryKeyType,
   <%= entity_name_downcase %>PrimaryKeyAttributeName,
-  <%= entity_name %>AttributesType
-} from "./<%= entity_name %>/Ambiguous"
+  <%= entity_short_name %>AttributesType
+} from "./<%= entity_short_name %>/Ambiguous"
 import {
-  Unloaded<%= entity_name %>,
-  Unloaded<%= entity_name %>AttributesType
-} from "./<%= entity_name %>/Unloaded"
+  Unloaded<%= entity_short_name %>,
+  Unloaded<%= entity_short_name %>AttributesType
+} from "./<%= entity_short_name %>/Unloaded"
 import {
-  Loaded<%= entity_name %>
-} from "./<%= entity_name %>/Loaded"
+  Loaded<%= entity_short_name %>
+} from "./<%= entity_short_name %>/Loaded"
 
 <% if has_associations? %>
 import {
-  <%= entity_name %>Atom,
-  <%= entity_name %>AtomAttributesType
-} from "./<%= entity_name %>/Atom"
+  <%= entity_short_name %>Atom,
+  <%= entity_short_name %>AtomAttributesType
+} from "./<%= entity_short_name %>/Atom"
 import {
-  <%= entity_name %>Aggregate,
-  <%= entity_name %>AggregateAttributesType
-} from "./<%= entity_name %>/Aggregate"
+  <%= entity_short_name %>Aggregate,
+  <%= entity_short_name %>AggregateAttributesType
+} from "./<%= entity_short_name %>/Aggregate"
 <% end %>
 
 export {
-  <%= entity_name %>,
-  type <%= entity_name %>AttributesType,
-  Unloaded<%= entity_name %>,
-  type Unloaded<%= entity_name %>AttributesType,
-  Loaded<%= entity_name %>,
+  <%= entity_short_name %>,
+  type <%= entity_short_name %>AttributesType,
+  Unloaded<%= entity_short_name %>,
+  type Unloaded<%= entity_short_name %>AttributesType,
+  Loaded<%= entity_short_name %>,
 <% if has_associations? %>
-  <%= entity_name %>Atom,
-  type <%= entity_name %>AtomAttributesType,
-  <%= entity_name %>Aggregate,
-  type <%= entity_name %>AggregateAttributesType,
+  <%= entity_short_name %>Atom,
+  type <%= entity_short_name %>AtomAttributesType,
+  <%= entity_short_name %>Aggregate,
+  type <%= entity_short_name %>AggregateAttributesType,
 <% end %>
-  type <%= entity_name %>PrimaryKeyType,
+  type <%= entity_short_name %>PrimaryKeyType,
   <%= entity_name_downcase %>PrimaryKeyAttributeName
 }

data/templates/Error.ts.erb

@@ -1,5 +1,5 @@
 <% dependency_roots.each do |dependency_root| %>
-import { <%= dependency_root.scoped_name %> } from "<%= path_to_root %><%= dependency_root.import_path %>"
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
 import { <%= error_base_class %> } from "<%= path_to_root %>base/Error"

data/templates/Model/Aggregate.ts.erb

@@ -1,12 +1,12 @@
 import {
-  <%= model_name %>,
-  <%= model_name %>AttributesType
-} from "./<%= model_name %>"
+  <%= model_short_name %>,
+  <%= model_short_name %>AttributesType
+} from "./<%= model_short_name %>"
 <% dependency_roots.each do |dependency_root| %>
-import { <%= dependency_root.ts_instance_name %> } from "<%= path_to_root %><%= dependency_root.import_path %>"
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
-export interface <%= model_name %>AggregateAttributesType extends <%= model_name %>AttributesType <%= attributes_type_ts_type %>
+export interface <%= model_short_name %>AggregateAttributesType extends <%= model_short_name %>AttributesType <%= attributes_type_ts_type %>
 
-export class <%= model_name %>Aggregate extends <%= model_name %><<%= model_name %>AggregateAttributesType> {
+export class <%= model_short_name %>Aggregate extends <%= model_short_name %><<%= model_short_name %>AggregateAttributesType> {
 }

data/templates/Model/Atom.ts.erb

@@ -1,12 +1,12 @@
 import {
-  <%= model_name %>,
-  <%= model_name %>AttributesType
-} from "./<%= model_name %>"
+  <%= model_short_name %>,
+  <%= model_short_name %>AttributesType
+} from "./<%= model_short_name %>"
 <% dependency_roots.each do |dependency_root| %>
-import { <%= dependency_root.ts_instance_name %> } from "<%= path_to_root %><%= dependency_root.import_path %>"
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
-export interface <%= model_name %>AtomAttributesType extends <%= model_name %>AttributesType <%= atom_attributes_ts_type %>
+export interface <%= model_short_name %>AtomAttributesType extends <%= model_short_name %>AttributesType <%= atom_attributes_ts_type %>
 
-export class <%= model_name %>Atom extends <%= model_name %><<%= model_name %>AtomAttributesType> {
+export class <%= model_short_name %>Atom extends <%= model_short_name %><<%= model_short_name %>AtomAttributesType> {
 }

data/templates/Model/Model.ts.erb

@@ -1,14 +1,14 @@
 import { Model } from "<%= path_to_root %>base/Model"
 <% dependency_roots.each do |dependency_root| %>
-import { <%= dependency_root.scoped_name %> } from "<%= path_to_root %><%= dependency_root.import_path %>"
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
-export interface <%= model_name %>AttributesType <%= attributes_type_ts_type %>
+export interface <%= model_short_name %>AttributesType <%= attributes_type_ts_type %>
 
-export class <%= model_name %><
-  AttributesType extends <%= model_name %>AttributesType = <%= model_name %>AttributesType
+export class <%= model_short_name %><
+  AttributesType extends <%= model_short_name %>AttributesType = <%= model_short_name %>AttributesType
 > extends Model<AttributesType> {
-  static readonly modelName: string = "<%= model_name %>"
+  static readonly modelName: string = "<%= model_short_name %>"
 
   <% attribute_names.each do |attribute_name| %>
   get <%= attribute_name %> (): AttributesType["<%= attribute_name %>"] {

data/templates/ModelVariants.ts.erb

@@ -1,26 +1,26 @@
 import {
-  <%= model_name %>,
-  <%= model_name %>AttributesType
-} from "./<%= model_name %>/<%= model_name %>"
+  <%= model_short_name %>,
+  <%= model_short_name %>AttributesType
+} from "./<%= model_short_name %>/<%= model_short_name %>"
 
 <% if has_associations? %>
 import {
-  <%= model_name %>Atom,
-  <%= model_name %>AtomAttributesType
-} from "./<%= model_name %>/Atom"
+  <%= model_short_name %>Atom,
+  <%= model_short_name %>AtomAttributesType
+} from "./<%= model_short_name %>/Atom"
 import {
-  <%= model_name %>Aggregate,
-  <%= model_name %>AggregateAttributesType
-} from "./<%= model_name %>/Aggregate"
+  <%= model_short_name %>Aggregate,
+  <%= model_short_name %>AggregateAttributesType
+} from "./<%= model_short_name %>/Aggregate"
 <% end %>
 
 export {
-  <%= model_name %>,
-  type <%= model_name %>AttributesType,
+  <%= model_short_name %>,
+  type <%= model_short_name %>AttributesType,
 <% if has_associations? %>
-  <%= model_name %>Atom,
-  type <%= model_name %>AtomAttributesType,
-  <%= model_name %>Aggregate,
-  type <%= model_name %>AggregateAttributesType,
+  <%= model_short_name %>Atom,
+  type <%= model_short_name %>AtomAttributesType,
+  <%= model_short_name %>Aggregate,
+  type <%= model_short_name %>AggregateAttributesType,
 <% end %>
 }

data/templates/Type/Type.ts.erb

@@ -1,5 +1,5 @@
 <% dependency_roots.each do |dependency_root| %>
-import { <%= dependency_root.ts_instance_name %> } from "<%= path_to_root %><%= dependency_root.import_path %>"
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
-export type <%= type_name %> = <%= type_guts %>
+export type <%= type_short_name %> = <%= type_guts %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foobara-typescript-remote-command-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Miles Georgi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara