@live-change/url-service 0.3.9 → 0.3.10

package/index.js

@@ -14,7 +14,7 @@ const {
   urlWriterRoles = ['writer']
 } = config
 
-const { Canonical, Redirect, UrlToTarget } = require("./model.js")
+const { Canonical, Redirect, UrlToTarget, UrlToTargetWithoutDomain } = require("./model.js")
 
 definition.view({
   name: "urlsByTargetAndPath",
@@ -50,6 +50,60 @@ definition.view({
   }
 })
 
+definition.view({
+  name: "urlsByTargetType",
+  properties: {
+    targetType: {
+      type: String,
+      validation: ['nonEmpty']
+    }
+  },
+  returns: {
+    type: Object,
+    properties: {
+      urlType: {
+        type: String,
+      },
+      target: {
+        type: String
+      }
+    }
+  },
+  daoPath(params, { client, service }, method) {
+    const { targetType } = params
+    const dp = UrlToTargetWithoutDomain.rangePath([ targetType ], App.extractRange(params))
+    //console.log("URLS PATH", params, '=>', dp)
+    return dp
+  }
+})
+
+definition.view({
+  name: "urlsByTargetTypeAndDomain",
+  properties: {
+    targetType: {
+      type: String,
+      validation: ['nonEmpty']
+    }
+  },
+  returns: {
+    type: Object,
+    properties: {
+      urlType: {
+        type: String,
+      },
+      target: {
+        type: String
+      }
+    }
+  },
+  daoPath(params, { client, service }, method) {
+    const { targetType, domain } = params
+    const dp = UrlToTarget.rangePath([ targetType, domain ], App.extractRange(params))
+    //console.log("URLS PATH", params, '=>', dp)
+    return dp
+  }
+})
+
 const randomLettersBig = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 const randomLettersSmall = 'abcdefghijklmnopqrstuvwxyz'
 const randomDigits = '0123456789'

package/model.js

@@ -62,7 +62,11 @@ const UrlToTarget = definition.index({
   name: 'Urls',
   function: async function(input, output) {
     const urlMapper = urlType => ({targetType, domain, path, target}) =>
-      ({ id: `"${targetType}":${JSON.stringify(domain)}:${JSON.stringify(path)}_"${target}"`, target, type: urlType })
+      ({
+        id: `"${targetType}":${JSON.stringify(domain)}:${JSON.stringify(path)}_"${target}"`,
+        target, domain, path,
+        type: urlType
+      })
     const redirectMapper = urlMapper('redirect')
     const canonicalMapper = urlMapper('canonical')
     await input.table('url_Redirect').onChange(
@@ -74,4 +78,24 @@ const UrlToTarget = definition.index({
   }
 })
 
-module.exports = { Canonical, Redirect, UrlToTarget }
+const UrlToTargetWithoutDomain = definition.index({
+  name: 'UrlsWithoutDomain',
+  function: async function(input, output) {
+    const urlMapper = urlType => ({targetType, domain, path, target}) =>
+      ({
+        id: `"${targetType}":${JSON.stringify(path)}_"${target}"`,
+        target, domain, path,
+        type: urlType
+      })
+    const redirectMapper = urlMapper('redirect')
+    const canonicalMapper = urlMapper('canonical')
+    await input.table('url_Redirect').onChange(
+      (obj, oldObj) => output.change(obj && redirectMapper(obj), oldObj && redirectMapper(oldObj))
+    )
+    await input.table('url_Canonical').onChange(
+      (obj, oldObj) => output.change(obj && canonicalMapper(obj), oldObj && canonicalMapper(oldObj))
+    )
+  }
+})
+
+module.exports = { Canonical, Redirect, UrlToTarget, UrlToTargetWithoutDomain }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/url-service",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,12 +21,12 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "0.7.6",
-    "@live-change/relations-plugin": "0.7.6",
+    "@live-change/framework": "0.7.8",
+    "@live-change/relations-plugin": "0.7.8",
     "lru-cache": "^7.12.0",
     "pluralize": "8.0.0",
     "progress-stream": "^2.0.0",
     "prosemirror-model": "^1.18.1"
   },
-  "gitHead": "5450bfda7a0eabc71152e8ebfc87d9e7ebf5448f"
+  "gitHead": "2517a729c452633bc3ce9725c05005a66b8f78ee"
 }