@ember-data/model 4.12.0-beta.8 → 4.12.0

package/addon/index.js

@@ -1 +1 @@
-export { a as attr, b as belongsTo, M as default, h as hasMany } from "./has-many-c84372b4";
+export { a as attr, b as belongsTo, M as default, h as hasMany } from "./has-many-465843f4";

package/blueprints/model/HELP.md

@@ -0,0 +1,26 @@
+<grey>You may generate models with as many attrs as you would like to pass. The following attribute types are supported:</grey>
+<yellow><attr-name></yellow>
+<yellow><attr-name></yellow>:array
+<yellow><attr-name></yellow>:boolean
+<yellow><attr-name></yellow>:date
+<yellow><attr-name></yellow>:object
+<yellow><attr-name></yellow>:number
+<yellow><attr-name></yellow>:string
+<yellow><attr-name></yellow>:your-custom-transform
+<yellow><attr-name></yellow>:belongs-to:<yellow><model-name></yellow>
+<yellow><attr-name></yellow>:has-many:<yellow><model-name></yellow>
+
+For instance: <green>\`ember generate model taco filling:belongs-to:protein toppings:has-many:toppings name:string price:number misc\`</green>
+would result in the following model:
+
+```js
+import Model, { belongsTo, hasMany, attr } from '@ember-data/model';
+
+export default class TacoModel extends Model {
+  @belongsTo('protein', { async: false, inverse: null }) filling;
+  @hasMany('topping', { async: false, inverse: null }) toppings;
+  @attr('string') name;
+  @attr('number') price;
+  @attr misc;
+}
+```

package/blueprints/model/files/__root__/__path__/__name__.js

@@ -0,0 +1,5 @@
+import Model<%= importedModules.length ? `, { ${importedModules} }` : '' %> from '@ember-data/model';
+
+export default Model.extend({
+<%= attrs.length ? attrs : '' %>
+});

package/blueprints/model/index.js

@@ -0,0 +1,150 @@
+const EOL = require('os').EOL;
+
+const inflection = require('inflection');
+const stringUtils = require('ember-cli-string-utils');
+const useEditionDetector = require('@ember-data/private-build-infra/src/utilities/edition-detector');
+const { has } = require('@ember/edition-utils');
+
+module.exports = useEditionDetector({
+  description: 'Generates an ember-data model.',
+
+  anonymousOptions: ['name', 'attr:type'],
+
+  root: __dirname,
+
+  locals(options) {
+    let attrs = [];
+    let needs = [];
+    let entityOptions = options.entity.options;
+    let includeHasMany = false;
+    let includeBelongsTo = false;
+    let includeAttr = false;
+
+    for (let name in entityOptions) {
+      let type = entityOptions[name] || '';
+      let foreignModel = name;
+      if (type.indexOf(':') > -1) {
+        foreignModel = type.split(':')[1];
+        type = type.split(':')[0];
+      }
+      let dasherizedName = stringUtils.dasherize(name);
+      let camelizedName = stringUtils.camelize(name);
+      let dasherizedType = stringUtils.dasherize(type);
+      let dasherizedForeignModel = stringUtils.dasherize(foreignModel);
+      let dasherizedForeignModelSingular = inflection.singularize(dasherizedForeignModel);
+
+      let attr;
+      if (/has-many/.test(dasherizedType)) {
+        includeHasMany = true;
+        let camelizedNamePlural = inflection.pluralize(camelizedName);
+        attr = {
+          name: dasherizedForeignModelSingular,
+          type: dasherizedType,
+          propertyName: camelizedNamePlural,
+        };
+      } else if (/belongs-to/.test(dasherizedType)) {
+        includeBelongsTo = true;
+        attr = {
+          name: dasherizedForeignModel,
+          type: dasherizedType,
+          propertyName: camelizedName,
+        };
+      } else {
+        includeAttr = true;
+        attr = {
+          name: dasherizedName,
+          type: dasherizedType,
+          propertyName: camelizedName,
+        };
+      }
+      attrs.push(attr);
+
+      if (/has-many|belongs-to/.test(dasherizedType)) {
+        needs.push("'model:" + dasherizedForeignModelSingular + "'");
+      }
+    }
+
+    if (attrs.length) {
+      let attrTransformer, attrSeparator;
+
+      let hasOctane = has('octane');
+      if (hasOctane && process.env.EMBER_EDITION === 'classic') {
+        hasOctane = false; //forcible override
+      }
+      if (hasOctane) {
+        attrTransformer = nativeAttr;
+        attrSeparator = ';';
+      } else {
+        attrTransformer = classicAttr;
+        attrSeparator = ',';
+      }
+
+      attrs = attrs.map(attrTransformer);
+      attrs = '  ' + attrs.join(attrSeparator + EOL + '  ');
+      if (hasOctane) {
+        attrs = attrs + attrSeparator;
+      }
+    }
+
+    let needsDeduplicated = needs.filter(function (need, i) {
+      return needs.indexOf(need) === i;
+    });
+    needs = '  needs: [' + needsDeduplicated.join(', ') + ']';
+
+    let importedModules = [];
+    if (includeAttr) {
+      importedModules.push('attr');
+    }
+    if (includeBelongsTo) {
+      importedModules.push('belongsTo');
+    }
+    if (includeHasMany) {
+      importedModules.push('hasMany');
+    }
+    importedModules = importedModules.join(', ');
+
+    return {
+      importedModules,
+      attrs,
+      needs,
+    };
+  },
+});
+
+function nativeAttr(attr) {
+  let name = attr.name,
+    type = attr.type,
+    propertyName = attr.propertyName,
+    result;
+
+  if (type === 'belongs-to') {
+    result = "@belongsTo('" + name + "', { async: false, inverse: null })";
+  } else if (type === 'has-many') {
+    result = "@hasMany('" + name + "', { async: false, inverse: null })";
+  } else if (type === '') {
+    result = '@attr';
+  } else {
+    result = "@attr('" + type + "')";
+  }
+  return result + ' ' + propertyName;
+}
+
+function classicAttr(attr) {
+  let name = attr.name,
+    type = attr.type,
+    propertyName = attr.propertyName,
+    result;
+
+  if (type === 'belongs-to') {
+    result = "belongsTo('" + name + "', { async: false, inverse: null })";
+  } else if (type === 'has-many') {
+    result = "hasMany('" + name + "', { async: false, inverse: null })";
+  } else if (type === '') {
+    //"If you don't specify the type of the attribute, it will be whatever was provided by the server"
+    //https://emberjs.com/guides/models/defining-models/
+    result = 'attr()';
+  } else {
+    result = "attr('" + type + "')";
+  }
+  return propertyName + ': ' + result;
+}

package/blueprints/model/native-files/__root__/__path__/__name__.js

@@ -0,0 +1,5 @@
+import Model<%= importedModules.length ? `, { ${importedModules} }` : '' %> from '@ember-data/model';
+
+export default class <%= classifiedModuleName %>Model extends Model {
+<%= attrs.length ? attrs : '' %>
+}

package/blueprints/model-test/index.js

@@ -0,0 +1,33 @@
+const path = require('path');
+
+const testInfo = require('ember-cli-test-info');
+const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
+const modulePrefixForProject = require('@ember-data/private-build-infra/src/utilities/module-prefix-for-project');
+
+const ModelBlueprint = require('../model');
+
+module.exports = useTestFrameworkDetector({
+  description: 'Generates a model unit test.',
+
+  root: __dirname,
+
+  fileMapTokens(options) {
+    return {
+      __root__() {
+        return 'tests';
+      },
+      __path__() {
+        return path.join('unit', 'models');
+      },
+    };
+  },
+
+  locals(options) {
+    const result = ModelBlueprint.locals.apply(this, arguments);
+
+    result.friendlyTestDescription = testInfo.description(options.entity.name, 'Unit', 'Model');
+    result.modulePrefix = modulePrefixForProject(options.project);
+
+    return result;
+  },
+});

package/blueprints/model-test/mocha-files/__root__/__path__/__test__.js

@@ -0,0 +1,18 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+
+import { setupModelTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupModelTest('<%= dasherizedModuleName %>', {
+    // Specify the other units that are required for this test.
+  <%= typeof needs !== 'undefined' ? needs : '' %>,
+  });
+
+  // Replace this with your real tests.
+  it('exists', function () {
+    let model = this.subject();
+    // var store = this.store();
+    expect(model).to.be.ok;
+  });
+});

package/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js

@@ -0,0 +1,15 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function () {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('<%= dasherizedModuleName %>', {});
+    expect(model).to.be.ok;
+  });
+});

package/blueprints/model-test/qunit-files/__root__/__path__/__test__.js

@@ -0,0 +1,14 @@
+import { module, test } from 'qunit';
+
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function (assert) {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('<%= dasherizedModuleName %>', {});
+    assert.ok(model);
+  });
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ember-data/model",
-  "version": "4.12.0-beta.8",
-  "description": "A presentation layer for apps built with @ember-data/store",
+  "version": "4.12.0",
+  "description": "A basic Ember implementation of a resource presentation layer for use with @ember-data/store",
   "keywords": [
     "ember-addon"
   ],
@@ -19,6 +19,7 @@
     "version": 1
   },
   "files": [
+    "blueprints",
     "addon-main.js",
     "addon",
     "README.md",
@@ -27,12 +28,12 @@
     "ember-data-logo-light.svg"
   ],
   "peerDependencies": {
-    "@ember-data/debug": "4.12.0-beta.8",
-    "@ember-data/json-api": "4.12.0-beta.8",
-    "@ember-data/legacy-compat": "4.12.0-beta.8",
-    "@ember-data/graph": "4.12.0-beta.8",
-    "@ember-data/store": "4.12.0-beta.8",
-    "@ember-data/tracking": "4.12.0-beta.8",
+    "@ember-data/debug": "4.12.0",
+    "@ember-data/json-api": "4.12.0",
+    "@ember-data/legacy-compat": "4.12.0",
+    "@ember-data/graph": "4.12.0",
+    "@ember-data/store": "4.12.0",
+    "@ember-data/tracking": "4.12.0",
     "@ember/string": "^3.0.1",
     "ember-inflector": "^4.0.2"
   },
@@ -53,7 +54,7 @@
     }
   },
   "dependencies": {
-    "@ember-data/private-build-infra": "4.12.0-beta.8",
+    "@ember-data/private-build-infra": "4.12.0",
     "@ember/edition-utils": "^1.2.0",
     "@embroider/macros": "^1.10.0",
     "ember-cached-decorator-polyfill": "^1.0.1",
@@ -63,33 +64,33 @@
     "inflection": "~2.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.3",
+    "@babel/core": "^7.21.4",
     "@babel/cli": "^7.21.0",
     "@glimmer/component": "^1.1.2",
-    "ember-source": "~4.11.0",
+    "ember-source": "~4.12.0",
     "@embroider/addon-dev": "^3.0.0",
     "rollup": "^3.20.2",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.21.0",
     "@babel/plugin-transform-typescript": "^7.21.3",
-    "@babel/plugin-transform-runtime": "^7.21.0",
-    "@babel/preset-typescript": "^7.21.0",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/plugin-transform-runtime": "^7.21.4",
+    "@babel/preset-typescript": "^7.21.4",
+    "@babel/preset-env": "^7.21.4",
     "@babel/runtime": "^7.21.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "tslib": "^2.5.0",
     "walk-sync": "^3.0.0",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.3"
   },
   "engines": {
-    "node": "^14.8.0 || 16.* || >= 18.*"
+    "node": "16.* || >= 18.*"
   },
   "volta": {
     "extends": "../../package.json"
   },
-  "packageManager": "pnpm@7.30.5",
+  "packageManager": "pnpm@8.1.0",
   "scripts": {
     "build": "rollup --config && babel ./addon --out-dir addon --plugins=../private-build-infra/src/transforms/babel-plugin-transform-ext.js",
     "start": "rollup --config --watch"